Merge branch 'release/0.0.2'

JonasWanke · Apr 9, 2019 · 6b38e6e · 6b38e6e
2 parents 043ea22 + 4e30546
commit 6b38e6e
Show file tree

Hide file tree

Showing 21 changed files with 270 additions and 174 deletions.
diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.md b/.github/ISSUE_TEMPLATE/1-bug-report.md
@@ -27,20 +27,21 @@ Please select the component label (C: abc) this bug is related to from the right
 <!-- A clear and concise description of what you expected to happen -->
 
 
+<!-- If applicable, add screenshots to help explain your problem
 **Screenshots**
-<!-- If applicable, add screenshots to help explain your problem -->
-
-| Description 1  | Description 2  | Description 3  |
-| :------------: | :------------: | :------------: |
-| <screenshot 1> | <screenshot 2> | <screenshot 3> |
 
+| Description 1  | Description 2  |
+| :------------: | :------------: |
+| <screenshot 1> | <screenshot 2> |
+-->
 
 **Environment:**
 <!-- Please complete the following information -->
- - Device:  <!-- e.g. Samsung Galaxy S8+ -->
- - Android version:  <!-- e.g. Android 8.0.0 -->
+ - OS:  <!-- e.g. Windows 10 Home 1809 -->
+ - Unicorn version:  <!-- e.g. 1.0.0 -->
 
 
+<!-- Add any other context about the problem here
 **Additional context**
-<!-- Add any other context about the problem here -->
+-->
 
diff --git a/.github/ISSUE_TEMPLATE/2-feature-request.md b/.github/ISSUE_TEMPLATE/2-feature-request.md
@@ -2,24 +2,21 @@
 name: "\U0001F680 Feature request"
 about: Suggest an idea for this project
 title: ''
-labels: 'T: feature'
+labels: 'T: feat'
 assignees: ''
 
 ---
 
 <!--
 Thanks for taking the time to file an issue!
-Please select the component label (C: abc) this feature is related to from the right.
+Please select the component label (C: abc) this feature is related to from the right (if applicable).
 -->
 
 **Description**
-<!-- A clear and concise description of the problem or missing capability -->
-
-
-**Solution**
-<!-- If you have a solution in mind, please describe it -->
+<!-- A clear and concise description of the problem or missing capability and possibly its solution -->
 
 
+<!-- Add any other context about the problem here
 **Additional context**
-<!-- Add any other context about the problem here -->
+-->
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,7 +3,7 @@
 <!--
 - The name of this PR should follow conventionalcommits.org.
 - When not using Unicorn to create PRs, please manually select a type (T: abc) and a component (C: abc) label
-  from the right.
+  from the right. Add the breaking label (PR: BREAKING) if applicable.
 - Please enter the corresponding issue ID in the placeholder above.
 -->
 
@@ -12,27 +12,25 @@
 <!-- Please check if your PR fulfills the following requirements: -->
 
 - [ ] Commit messages follow conventionalcommits.org
-- [ ] Tested in production
 - [ ] Tests for the changes have been added (for bug fixes / features)
 - [ ] Docs have been added / updated (for bug fixes / features)
 
 
 **Changes**
-<!-- Please list your changes: -->
+<!-- Please summarize your changes -->
 
--
--
--
 
 
 <!-- Add this section if you need it.
 **Screenshots**
 
-| Description 1  | Description 2  | Description 3  |
-| :------------: | :------------: | :------------: |
-| <screenshot 1> | <screenshot 2> | <screenshot 3> |
+| Description 1  | Description 2  |
+| :------------: | :------------: |
+| <screenshot 1> | <screenshot 2> |
 -->
 
 
+<!-- Optional
 **Other information**
-<!-- Optional -->
+-->
+
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.unicorn.yml b/.unicorn.yml
@@ -0,0 +1,6 @@
+---
+unicornVersion: "0.0.2"
+type: "OTHER"
+name: "Unicorn"
+description: "\U0001f984 A tool to create, work on, test and deploy projects."
+version: "0.0.2"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,10 +23,37 @@ Optional intro comment.
 ## [Unreleased] - see [milestones] for our roadmap
 
 
+<a name="0.0.2"></a>
+## [0.0.2](https://github.com/JonasWanke/Unicorn/compare/v0.0.1...v0.0.2) - 2019-04-09
+
+
+### Features
+
+- use unicorn ([#37](https://github.com/JonasWanke/Unicorn/pull/37)), fixes [#34](https://github.com/JonasWanke/Unicorn/issues/34)
+- **commands/init:** support init in existing repo ([#36](https://github.com/JonasWanke/Unicorn/pull/36)), fixes [#28](https://github.com/JonasWanke/Unicorn/issues/28), [#20](https://github.com/JonasWanke/Unicorn/issues/20), [#27](https://github.com/JonasWanke/Unicorn/issues/27)
+- **commands/login:** remove password support ([#42](https://github.com/JonasWanke/Unicorn/pull/42)), fixes [#32](https://github.com/JonasWanke/Unicorn/issues/32)
+
+
+### Bug Fixes
+
+- **commands/init:** only create .gitignore if templates were selected ([#41](https://github.com/JonasWanke/Unicorn/pull/41)), fixes [#30](https://github.com/JonasWanke/Unicorn/issues/30)
+
+
+### Docs
+
+- **commands/init:** fix/shorten templates and labels ([#44](https://github.com/JonasWanke/Unicorn/pull/44)), fixes [#35](https://github.com/JonasWanke/Unicorn/issues/35)
+
+
+### Refactor
+
+- rename config files ([#40](https://github.com/JonasWanke/Unicorn/pull/40)), fixes [#29](https://github.com/JonasWanke/Unicorn/issues/29)
+
+
+
 ## 0.0.1 - 2019-01-30
 
 Initial release supporting repository initialization.
 
 
 [milestones]: https://github.com/JonasWanke/Unicorn/milestones
-[Unreleased]: https://github.com/JonasWanke/Unicorn/compare/v0.0.1...dev
+[Unreleased]: https://github.com/JonasWanke/Unicorn/compare/v0.0.2...dev
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Thu Apr 04 16:06:29 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
diff --git a/res/config/github-labels.yaml b/res/config/github-labels.yaml
@@ -10,15 +10,17 @@
 
 - name: "PR: wip"
   color: "64eac4"
+- name: "PR: breaking"
+  color: "64eac4"
 
-- name: "C: <component>/<subcomponent>"
+- name: "C: <component>"
   color: "c2e0c6"
 
 - name: "T: ci"
   color: "c5def5"
 - name: "T: docs"
   color: "c5def5"
-- name: "T: feature"
+- name: "T: feat"
   color: "c5def5"
 - name: "T: fix"
   color: "c5def5"

diff --git a/res/templates/github/ISSUE_TEMPLATE/1-bug-report.md b/res/templates/github/ISSUE_TEMPLATE/1-bug-report.md
@@ -27,20 +27,22 @@ Please select the component label (C: abc) this bug is related to from the right
 <!-- A clear and concise description of what you expected to happen -->
 
 
+<!-- If applicable, add screenshots to help explain your problem
 **Screenshots**
-<!-- If applicable, add screenshots to help explain your problem -->
-
-| Description 1  | Description 2  | Description 3  |
-| :------------: | :------------: | :------------: |
-| <screenshot 1> | <screenshot 2> | <screenshot 3> |
 
+| Description 1  | Description 2  |
+| :------------: | :------------: |
+| <screenshot 1> | <screenshot 2> |
+-->
 
 **Environment:**
 <!-- Please complete the following information -->
  - Device:  <!-- e.g. Samsung Galaxy S8+ -->
- - Android version:  <!-- e.g. Android 8.0.0 -->
+ - OS:  <!-- e.g. Windows 10 Home 1809 -->
+ - Program/library version:  <!-- e.g. 1.0.0 -->
 
 
+<!-- Add any other context about the problem here
 **Additional context**
-<!-- Add any other context about the problem here -->
+-->
 
diff --git a/res/templates/github/ISSUE_TEMPLATE/2-feature-request.md b/res/templates/github/ISSUE_TEMPLATE/2-feature-request.md
@@ -2,24 +2,21 @@
 name: "\U0001F680 Feature request"
 about: Suggest an idea for this project
 title: ''
-labels: 'T: feature'
+labels: 'T: feat'
 assignees: ''
 
 ---
 
 <!--
 Thanks for taking the time to file an issue!
-Please select the component label (C: abc) this feature is related to from the right.
+Please select the component label (C: abc) this feature is related to from the right (if applicable).
 -->
 
 **Description**
-<!-- A clear and concise description of the problem or missing capability -->
-
-
-**Solution**
-<!-- If you have a solution in mind, please describe it -->
+<!-- A clear and concise description of the problem or missing capability and possibly its solution -->
 
 
+<!-- Add any other context about the problem here
 **Additional context**
-<!-- Add any other context about the problem here -->
+-->
 
diff --git a/res/templates/github/PULL_REQUEST_TEMPLATE.md b/res/templates/github/PULL_REQUEST_TEMPLATE.md
@@ -3,7 +3,7 @@
 <!--
 - The name of this PR should follow conventionalcommits.org.
 - When not using Unicorn to create PRs, please manually select a type (T: abc) and a component (C: abc) label
-  from the right.
+  from the right. Add the breaking label (PR: BREAKING) if applicable.
 - Please enter the corresponding issue ID in the placeholder above.
 -->
 
@@ -12,28 +12,25 @@
 <!-- Please check if your PR fulfills the following requirements: -->
 
 - [ ] Commit messages follow conventionalcommits.org
-- [ ] Tested on actual devices
 - [ ] Tests for the changes have been added (for bug fixes / features)
 - [ ] Docs have been added / updated (for bug fixes / features)
 
 
 **Changes**
-<!-- Please list your changes: -->
+<!-- Please summarize your changes -->
 
--
--
--
 
 
 <!-- Add this section if you need it.
 **Screenshots**
 
-| Description 1  | Description 2  | Description 3  |
-| :------------: | :------------: | :------------: |
-| <screenshot 1> | <screenshot 2> | <screenshot 3> |
+| Description 1  | Description 2  |
+| :------------: | :------------: |
+| <screenshot 1> | <screenshot 2> |
 -->
 
 
+<!-- Optional
 **Other information**
-<!-- Optional -->
+-->
 
diff --git a/res/templates/gitignore b/res/templates/gitignore
@@ -1 +0,0 @@
-.github

diff --git a/src/main/kotlin/com/jonaswanke/unicorn/GlobalConfig.kt b/src/main/kotlin/com/jonaswanke/unicorn/GlobalConfig.kt
@@ -8,14 +8,12 @@ data class GlobalConfig(
 ) {
     data class GithubConfig(
         val username: String,
-        val password: String?,
-        val oauthToken: String?,
+        val oauthToken: String,
         val endpoint: String?
     ) {
         fun buildGithub(): GitHub {
             return GitHubBuilder().apply {
                 withOAuthToken(oauthToken, username)
-                withPassword(username, password)
                 if (endpoint != null) withEndpoint(endpoint)
             }.build()
         }

diff --git a/src/main/kotlin/com/jonaswanke/unicorn/ProgramConfig.kt b/src/main/kotlin/com/jonaswanke/unicorn/ProgramConfig.kt
@@ -3,5 +3,5 @@ package com.jonaswanke.unicorn
 import net.swiftzer.semver.SemVer
 
 object ProgramConfig {
-    val VERSION = SemVer.parse("0.0.1")
+    val VERSION = SemVer.parse("0.0.2")
 }
diff --git a/src/main/kotlin/com/jonaswanke/unicorn/ProjectConfig.kt b/src/main/kotlin/com/jonaswanke/unicorn/ProjectConfig.kt
@@ -7,8 +7,7 @@ data class ProjectConfig(
     val type: Type,
     val name: String,
     val description: String?,
-    val version: SemVer,
-    val githubName: String? = null
+    val version: SemVer
 ) {
     enum class Type {
         ANDROID,