allegro_release 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21cd14882704d7d59db9e50860adadb65c617268
-  data.tar.gz: 634e64b48221019aab86036997a29910cc68922f
+  metadata.gz: 108219e4e653df3cd90bf18e551899b0ae7a47f1
+  data.tar.gz: ddcc1f84bad92b8bbb2c985cbc0e2ba2ee175a1c
 SHA512:
-  metadata.gz: e1c730b3051c8a4094a4ae384472b4e4bb15cc67bf4cb94b0f958a0724f60f7a05cfe62628bc0dbdb5162de52c28210da668bd0b7784c9abc1d72033d78d30b7
-  data.tar.gz: 4fd502a9e25f6db3d808c9058335753ba156e8ec83535e6a61d34249d72c985db757ff54687fb8a585bfbb29f1ce5f8770df63f1e0c4c3de038b25615d7d7a4f
+  metadata.gz: 397015df10ceb48d6afa454457f190d96f48606970e09e01b564c11255331471341648cf24b906b80c2274b25af89ad3e1397f21eaca97da814e37091db160ed
+  data.tar.gz: b5f0ade03a232bf075f6a13508baa10e1cbffdb7e0225ee84dc83ab1a7e7d37160505dfdbc25faf406de1ac58dbd3e78b5ddd8254a518076d969a798cca02425

data/exe/allegro_release

@@ -10,7 +10,7 @@ Releases a private pod.
 Procedure - https://stash.allegrogroup.com/projects/IOSTOOLS/repos/pods.specs/browse.
 
 Usage:
-    allegro_release current    # shows current version
+    allegro_release current    # shows current version of .podspec file
     allegro_release patch      # bumps patch version (1.0.X) and performs step 1 of procedure
     allegro_release minor      # bumps minor version (1.X.0) and performs step 1 of procedure
     allegro_release major      # bumps major version (X.0.0) and performs step 1 of procedure

data/lib/allegro_release/version.rb

@@ -1,3 +1,3 @@
 module AllegroRelease
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/allegro_release.rb

@@ -50,7 +50,7 @@ module AllegroRelease
     def self.add_tag
       puts "Adding tag #{version_from_file} and pushing to origin.".colorize(:green)
       system_cmd("git tag #{version_from_file}")
-      system_cmd("git push origin --tags")
+      system_cmd("git push origin #{version_from_file}")
     end
 
     def self.push_to_spec_repository
@@ -59,11 +59,17 @@ module AllegroRelease
     end
 
     def self.to_master
+      create_local_master
       checkout_release
       create_pull_request_to_master
       puts "Second step is done! Now head to HipChat and paste the content of clipboard that contains link to pull request. After manual merge perform `allegro_release finish`.".colorize(:green)
     end
 
+    def self.create_local_master
+      puts "Fetching master and creating local master branch if not already present.".colorize(:green)
+      system_cmd("git fetch origin master:master")
+    end
+
     def self.create_pull_request_to_master
       puts "Creating pull request to master on Stash.".colorize(:green)
       pull_request_command = "stash pull-request master -T \"Release #{version_from_file}.\" -d \"Release #{version_from_file}.\""
@@ -93,11 +99,13 @@ module AllegroRelease
     def self.perform_pull_request(pull_request_command)
       link = `#{pull_request_command}`
       if link.include? 'Authentication failed. Please check your credentials and try again.'
-        expired_credentials = "Your Stash credentials expired (probably due to monthly password change). Below you can find instruction what values to enter. Authorizing again. \n".colorize(:red)
-        tip_one = "Bitbucket Server Username: <your_username> (go to \"View Profile\" in upper-right corner of Stash)\n".colorize(:green)
-        tip_two = "Bitbucket Server Password (optional): <your_password>\n".colorize(:green)
-        tip_three = "Bitbucket Server URL: https://stash.allegrogroup.com/\n".colorize(:green)
-        puts expired_credentials + tip_one + tip_two + tip_three
+        expired_credentials = "Your Stash credentials expired (probably due to monthly password change). Below you can find instruction about what values to enter. Authorizing again. \n".colorize(:red)
+        tip_one = "1. Bitbucket Server Username: <your_username> (go to \"View Profile\" in upper-right corner of Stash)\n".colorize(:blue)
+        tip_two = "2. Bitbucket Server Password (optional): <your_password>\n".colorize(:blue)
+        tip_three = "3. Bitbucket Server URL: https://stash.allegrogroup.com/\n".colorize(:blue)
+        tip_four = "4. Remote (optional): (just press enter)\n".colorize(:blue)
+        tip_five = "5. Create a git alias 'git create-pull-request'?: n\n".colorize(:blue)
+        puts expired_credentials + tip_one + tip_two + tip_three + tip_four + tip_five
         system_cmd("stash configure")
         link = `#{pull_request_command}`
       end
@@ -111,7 +119,7 @@ module AllegroRelease
 
     def self.commit_release(version)
       cli = HighLine.new
-      jira_id = cli.ask("Give JIRA issue ID to commit changes (e.g. IOSBUYERS-1234 or ICETIOS-368): ".colorize(:yellow)) { |q| q.validate = /\A[A-Z]+-\d+\z/ }
+      jira_id = cli.ask("Give JIRA issue ID to commit changes (e.g. IOSBUY-264 or ICETIOS-368): ".colorize(:yellow)) { |q| q.validate = /\A[A-Z]+-\d+\z/ }
       commit(jira_id, version)
     end
 
@@ -161,10 +169,9 @@ module AllegroRelease
 
     def self.checkout_release
       return unless File.directory?(".git")
-      puts "Pulling release_#{version_from_file} branch.".colorize(:green)
+      puts "Pulling & checking out release_#{version_from_file} branch.".colorize(:green)
       system_cmd("git checkout release_#{version_from_file}")
       system_cmd("git pull")
-      puts "Checking out release_#{version_from_file} branch.".colorize(:green)
     end
 
     def self.commit(jira_id, version)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: allegro_release
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Aleksander Grzyb
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: A command line tools to release module.