MuranoCLI 3.2.1.pre.beta.7 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfbb8f408935daa8c012e04617a69badbba68c3bde1aad3fb9efe8973d83961e
-  data.tar.gz: 73075b87b642254cb03aa6d80c5801c9b566027d5f3b1d39a2abc7db19c4d036
+  metadata.gz: 38abeb7cb029e2aeaf5f1931ec1b061bd0f717db66f9ea4282035390a5055e7f
+  data.tar.gz: a9334098fa3463d71548f96b7705be2a20af63d12f973cd59afbcebded6873df
 SHA512:
-  metadata.gz: d2de8997ef9b11542b6872505dd0c32933a482a90abc45f7f332a6ecafec861696e8bfc8bd87569b2ef656a2d72ec5e5dbbf9ee5b1dcfe530655285efe6583c7
-  data.tar.gz: dfa7c497d18314135484ba8c54cd4a1b683c8a81f873f2d5d3f3b53d49b1542f4acb8d2855ab6491d03386ce5fcf323750160d8915048c01a15e7991176a72f2
+  metadata.gz: 467458e08a364f08f1ac1433b975ca9f963ddcc9c3f5c6618ed0862168ad37d8ad6671d42b9f7f87558583c4f0e2b0a6ce4f4b73b8b47e0c03d4d0cb71c2b5e9
+  data.tar.gz: 5c9ad4b00fbbc2552a4353b2398984d188787a71d82b6ca0a0c7c334892dad031679f84892d8b7bdbaf3909e615a3b4dc229f88b443c714d96772a44d284af81

data/Rakefile

@@ -191,7 +191,7 @@ def ff_branch(branch)
   git_working_tree_clean!
   sh %(git checkout #{branch})
   sh %(git fetch --prune --multiple origin upstream)
-  sh %(git merge --ff-only upstream/#{branch})
+  sh %(git merge --ff-only upstream/develop)
   sh %(git push origin #{branch})
 end
 
@@ -203,7 +203,7 @@ def ff_master
   ff_branch('master')
 end
 
-desc 'Fast-forward merge upstream/develop into origin/develop'
+desc 'Fast-forward merge upstream/develop into origin/(develop|master)'
 task :ff do
   current_branch = git_branchname
   ff_develop
@@ -241,8 +241,8 @@ namespace :bump do
 
     build_gem_install_user(next_ver)
 
-    # (lb): Meh. We could push to origin. Or not.
-    #  sh %(git push origin HEAD)
+    sh %(git push origin HEAD -u)
+
     require 'rainbow'
     $stdout.puts Rainbow("Bumped! New version: #{next_ver}").magenta.bright
   end
@@ -370,6 +370,8 @@ namespace :package do
     _parts = split_version_string(must_beta: true)
     current_branch = git_branchname
     ff_develop
+    # ff_branch only pushes to origin; here we really mean business.
+    sh %(git push upstream develop)
     tag_version("v#{current_ver}", 'develop')
     sh %(git checkout #{current_branch})
     # Tell the user what to do next.
@@ -381,6 +383,7 @@ namespace :package do
     _parts = split_version_string(must_beta: false)
     current_branch = git_branchname
     ff_master
+    sh %(git push upstream master)
     tag_version("v#{current_ver}", 'master')
     sh %(git checkout #{current_branch})
     # Tell the user what to do next.

data/lib/MrMurano/version.rb

@@ -26,7 +26,7 @@ module MrMurano
   #     '3.0.0-beta.2' is changed to '3.0.0.pre.beta.2'
   #   which breaks our build (which expects the version to match herein).
   #   So stick to using the '.pre.X' syntax, which ruby/gems knows.
-  VERSION = '3.2.1.pre.beta.7'
+  VERSION = '3.2.1'
   EXE_NAME = File.basename($PROGRAM_NAME)
   SIGN_UP_URL = 'https://exosite.com/signup/'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MuranoCLI
 version: !ruby/object:Gem::Version
-  version: 3.2.1.pre.beta.7
+  version: 3.2.1
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-10 00:00:00.000000000 Z
+date: 2018-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: certified
@@ -576,9 +576,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6