ora-cli 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd1423dfdf8ebad26c10086faa352d0026fc5632
-  data.tar.gz: e1ff3475dde5cdbebc6e1ab7ca08836ba04d0dfd
+  metadata.gz: 37f2683d7437533d89260be6e9e6bc4c58835886
+  data.tar.gz: ca4045ee65cfffa7e5a213417fb06110baeac40e
 SHA512:
-  metadata.gz: 2223e7f94692339f66ddbea3ca552e14c370bdf51af3cb71d6f4e4f38c6d5ab2ec287b2839e00886ab5ffa46105723bb57fb6310039369b35fede7b1e1049faf
-  data.tar.gz: 7adbde3472b70c8302442c311ff2427b753f3011f13c7d90122f745d3f5942d17f85b5054154d68ddfea74104525a7326b8323f4dd01b6285120cea696280509
+  metadata.gz: d7831147f18cb4bf23daa857b9a36f59fabaa0ed9fccfa9ee3cc1f4c8cc1f5a4811243c96b8841ee5c5a64597ead5fbaea56a1d4596ab44d8b38bef5f038dfad
+  data.tar.gz: 90fc6a50ed74e3d084d1ba108d16899e03152ef2174fd26709029328dddf0cda400b03cc9415697c82c9a0d330b6018dac4cc6260d5b2977b1e0b8aec8009f2b

data/README.md

@@ -29,9 +29,9 @@ A command line tool to automate development workflow in ORA
 
   `push_to_uat`: Help to push your feature branch to uat
 
-  `push_to_master`: Help to push your feature branch to develop and master branches with a version tag
+  `push_to_master`: Help to push develop to master with a version tag with a message including all new pull requests from the previous tag
 
-  `switch_branch`: Help to switch branch without thinking about dirty files`
+  `switch_branch`: Help to switch branch without thinking about dirty files
 
 ## Contributing
 

data/lib/ora/cli/tasks/push_to_master.rb

@@ -6,9 +6,8 @@ module Ora::Cli
 
     def commands
       '
-      :feature_branch!
-      :clean_branch!
-      :pull_branch
+      :clean_on_main_branch!
+      git stash save -u "OraCli"
       git checkout develop
       git pull origin develop
       git merge #{branch}
@@ -20,21 +19,27 @@ module Ora::Cli
       git fetch --tags
       :set_version
       git checkout #{branch}
-      git tag -a "#{version}" -m "#{branch}"
-      git push --tags
+      :apply_stash
       :slack_message_to_paste
       '
     end
 
     private
     def set_version
+      return '' if tag_message.empty?
+
       print.plain "Latest versions:"
       print.plain latest_versions
+      print.plain tag_message
       print.plain "Enter to use #{recommend_version} or type new version:"
       print.inline "New Version: "
       @version = stdin.gets(/^(v[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)?$/)
       @version = recommend_version if @version.empty?
-      ''
+
+      '
+      git tag -a "#{version}" -m "#{tag_message}"
+      git push --tags
+      '
     end
     def latest_versions
       @latest_versions ||=
@@ -43,15 +48,45 @@ module Ora::Cli
           map    {|tag| Gem::Version.create(tag.sub(/^v/, ''))}.sort.last(5).
           map    {|ver| "v#{ver}"}.join("\n")
     end
+    def latest_version
+      @latest_version ||= latest_versions.split("\n").last.to_s
+    end
     def recommend_version
-      @recommend_version ||=
-        latest_versions.split("\n").last.to_s.
-          sub(/\.(\d+)$/, '.') + ($1.to_i + 1).to_s
+      @recommend_version ||= latest_version.sub(/\.(\d+)$/, '.') + ($1.to_i + 1).to_s
     end
 
     def slack_message_to_paste
       print.plain ":merge: #{branch} => develop\n:merge: develop => master\n:monorail: production"
       ''
     end
+
+    def apply_stash
+      return '' if target_stash_revision.empty?
+
+      "git stash pop #{target_stash_revision}"
+    end
+    def target_stash_revision
+      @target_stash_revision ||=
+        @bash.silent("git stash list | grep '#{target_stash_name}' | sed s/:.*//").
+          split("\n").first.to_s.strip
+    end
+    def target_stash_name
+      "On #{branch}: OraCli"
+    end
+
+    def tag_message
+      return @tag_message if @tag_message
+      messages = []
+      @bash.silent("git log --merges --pretty=oneline #{latest_version}..HEAD").split("\n").each do |commit|
+        match = commit.match(/^[0-9a-z]+ Merge pull request #(\d+) from (.*)$/)
+        next if match.nil?
+
+        pull_request = match[1]
+        branch_name  = match[2]
+
+        messages << "#{pull_request} #{branch_name}"
+      end
+      @tag_message = messages.join("\n")
+    end
   end
 end

data/lib/ora/cli/version.rb

@@ -1,5 +1,5 @@
 module Ora
   module Cli
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ora-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ducksan Cho