gem-release 2.0.0.dev.3 → 2.0.0.dev.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3379c9a8fe1a960836949e5167f96f83d10c71c7
-  data.tar.gz: a59c0b440b3d1ffd6cc862f2d696b267b478268d
+  metadata.gz: c266a1ed9b7d5a3b2f1594b0aa4a14e98faafd87
+  data.tar.gz: ed1b9717bc85dbf71f9adf5d17b389e2a1b26a78
 SHA512:
-  metadata.gz: 3c31dd8dadfea502f17759e37228e920e773d7a7584d84cbc2c58ea5752ea9fd6bfd9ee2499866756feea1a6297d203c13384dee10d7a6b74aaa7a44a5309f82
-  data.tar.gz: 6e23a458c04035355e4e62c78992e125f17f39a9d1a5d24f26326cdb906ab1477263619b8f6fd88927b27490bba13d205af9384466bdc644f24116141f5dbba9
+  metadata.gz: cc5fe621e481c9aeae16e3bca40ca475a1c6d3f708c5c4ee4bf225d783e581f7a10b6f235dcf490b6d853174f2a605c1d2da9b9ef65505c0dbf0c807babb2926
+  data.tar.gz: 2db3a96f254bd5bda9ebfd4f6900643de49e9a921e87be4cb4410c96184a20f35d7ac907441dfb2960bf73eb0093594e5345f884f9be249e38b8cd9b29a282b7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gem-release (2.0.0.dev.1)
+    gem-release (2.0.0.dev.3)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -182,13 +182,17 @@ gem_name - name of the gem (optional, will use the directory name, or all gemspe
 ### Options
 
 ```
--c, --[no-]commit                Perform a commit after incrementing gem version
+-v, --version VERSION            Target version: next [major|minor|patch|pre|release] or a given version number [x.x.x]
+-c, --[no-]commit                Create a commit after incrementing gem version
+-m, --message                    Commit message template
+    --skip-ci                    Add the [skip ci] tag to the commit message
 -p, --[no-]push                  Push the new commit to the git remote repository
     --remote REMOTE              Git remote to push to (defaults to origin)
--v, --version VERSION            Target version: next [major|minor|patch|pre|release] or a given version number [x.x.x]
+-s, --sign                       GPG sign the commit message
 -t, --tag                        Shortcut for running the `gem tag` command
 -r, --release                    Shortcut for the `gem release` command
     --recurse                    Recurse into directories that contain gemspec files
+    --file                       Full path to the version file
     --pretend
 ```
 
@@ -334,11 +338,11 @@ version is `1.0.0`, then The tag is created using the command `git tag
 ### Setup
 
 ```
-export GEM_RELEASE_PUSH=false
 cd /tmp
 rm -rf foo
 gem bootstrap foo
-tree
+cd foo
+tree -a -I .git
 ```
 
 ### Directory structure
@@ -358,26 +362,28 @@ tree
 
 ```
 # this bumps foo
-cd /tmp/foo
-gem bump
+cd /tmp/foo; gem bump
 
 # this also bumps foo
-cd /tmp/foo
-gem bump foo
+cd /tmp/foo; gem bump foo
 ```
 
+### Demo
+
+![gem-release-scenario-1](https://cloud.githubusercontent.com/assets/2208/25634572/68d1fd20-2f7b-11e7-83bc-9e11f60438f3.gif)
+
+
 ## Scenario 2: Multiple gems in root
 
 ### Setup
 
 ```
-export GEM_RELEASE_PUSH=false
 cd /tmp
-rm -rf foo
+rm -rf foo bar
 gem bootstrap foo
 cd foo
 gem bootstrap bar --dir .
-tree
+tree -a -I .git
 ```
 
 ### Directory structure
@@ -401,39 +407,37 @@ tree
 
 ```
 # this bumps both foo and bar
-cd /tmp/foo
-gem bump --recurse
+cd /tmp/foo; gem bump --recurse
 
 # this also bumps both foo and bar
-cd /tmp/foo
-gem bump foo bar
+cd /tmp/foo; gem bump foo bar
 
 # this bumps foo (because it's the first gemspec found)
-cd /tmp/foo
-gem bump
+cd /tmp/foo; gem bump
 
 # this bumps foo
-cd /tmp/foo
-gem bump foo
+cd /tmp/foo; gem bump foo
 
 # this bumps bar
-cd /tmp/foo
-gem bump bar
+cd /tmp/foo; gem bump bar
 ```
 
+### Demo
+
+![gem-release-scenario-2](https://cloud.githubusercontent.com/assets/2208/25634575/68dcb670-2f7b-11e7-991e-901283164d21.gif)
+
 ## Scenario 3: Multiple gems in sub directories
 
 ### Setup
 
 ```
-export GEM_RELEASE_PUSH=false
 cd /tmp
 rm -rf root
 mkdir root
 cd root
 gem bootstrap foo
 gem bootstrap bar
-tree
+tree -a -I .git
 ```
 
 ### Directory structure
@@ -462,32 +466,31 @@ tree
 
 ```
 # this bumps both foo and bar
-cd /tmp/root
-gem bump --recurse
+cd /tmp/root; gem bump --recurse
 
 # this also bumps both foo and bar
-cd /tmp/root
-gem bump foo bar
+cd /tmp/root; gem bump foo bar
 
 # this does bumps both foo and bar
-cd /tmp/root
-gem bump
+cd /tmp/root; gem bump
 
 # this bumps foo
-cd /tmp/root
-gem bump foo
+cd /tmp/root; gem bump foo
 
 # this bumps bar
-cd /tmp/root
-gem bump bar
+cd /tmp/root; gem bump bar
 ```
 
+### Demo
+
+![gem-release-scenario-3](https://cloud.githubusercontent.com/assets/2208/25634573/68d51c3a-2f7b-11e7-8ec8-629bc8019d16.gif)
+
+
 ## Scenario 4: Nested gem with a conventional sub directory name
 
 ### Setup
 
 ```
-export GEM_RELEASE_PUSH=false
 cd /tmp
 rm -rf sinja
 gem bootstrap sinja
@@ -496,7 +499,7 @@ mkdir extensions
 cd extensions
 gem bootstrap sinja-sequel
 cd /tmp/sinja
-tree
+tree -a -I .git
 ```
 
 ### Directory structure
@@ -526,36 +529,33 @@ tree
 
 ```
 # this bumps both sinja and sinja-sequel
-cd /tmp/sinja
-gem bump --recurse
+cd /tmp/sinja; gem bump --recurse
 
 # this bumps sinja
-cd /tmp/sinja
-gem bump
+cd /tmp/sinja; gem bump
 
 # this also bumps sinja
-cd /tmp/sinja
-gem bump sinja
+cd /tmp/sinja; gem bump sinja
 
 # this bumps sinja-sequel
-cd /tmp/sinja
-gem bump sinja-sequel
+cd /tmp/sinja; gem bump sinja-sequel
 
 # this also bumps sinja-sequel
-cd /tmp/sinja/extensions/sinja-sequel
-gem bump
+cd /tmp/sinja/extensions/sinja-sequel; gem bump
 
 # this also bumps sinja-sequel
-cd /tmp/sinja/extensions/sinja-sequel
-gem bump sinja-sequel
+cd /tmp/sinja/extensions/sinja-sequel; gem bump sinja-sequel
 ```
 
+### Demo
+
+![gem-release-scenario-4](https://cloud.githubusercontent.com/assets/2208/25634576/68dce4a6-2f7b-11e7-9d6b-571d672e4998.gif)
+
 ## Scenario 5: Nested gem with an irregular sub directory name
 
 ### Setup
 
 ```
-export GEM_RELEASE_PUSH=false
 cd /tmp
 rm -rf sinja
 gem bootstrap sinja
@@ -565,7 +565,7 @@ cd extensions
 gem bootstrap sinja-sequel
 mv sinja-sequel sequel
 cd /tmp/sinja
-tree
+tree -a -I .git
 ```
 
 ### Directory structure
@@ -595,30 +595,28 @@ tree
 
 ```
 # this bumps both sinja and sinja-sequel
-cd /tmp/sinja
-gem bump --recurse
+cd /tmp/sinja; gem bump --recurse
 
 # this bumps sinja
-cd /tmp/sinja
-gem bump
+cd /tmp/sinja; gem bump
 
 # this also bumps sinja
-cd /tmp/sinja
-gem bump sinja
+cd /tmp/sinja; gem bump sinja
 
 # this bumps sinja-sequel only
-cd /tmp/sinja
-gem bump sinja-sequel
+cd /tmp/sinja; gem bump sinja-sequel
 
 # this also bumps sinja-sequel only
-cd /tmp/sinja/extensions/sequel
-gem bump
+cd /tmp/sinja/extensions/sequel; gem bump
 
 # this also bumps sinja-sequel only
-cd /tmp/sinja/extensions/sequel
-gem bump sinja-sequel
+cd /tmp/sinja/extensions/sequel; gem bump sinja-sequel
 ```
 
+### Demo
+
+![gem-release-scenario-5](https://cloud.githubusercontent.com/assets/2208/25634574/68d6d138-2f7b-11e7-9e64-e4c86cb85b9a.gif)
+
 
 # Development
 

data/lib/gem/release/cmds/bootstrap.rb

@@ -95,11 +95,11 @@ module Gem
         end
 
         opt '--rspec', DESCR[:rspec] do |value|
-          (opts[:templates] ||= []) << value
+          (opts[:templates] ||= []) << :rspec
         end
 
         opt '--travis', DESCR[:travis] do |value|
-          (opts[:templates] ||= []) << value
+          (opts[:templates] ||= []) << :travis
         end
 
         opt '-l', '--no-license NAME', DESCR[:license] do |value|

data/lib/gem/release/cmds/bump.rb

@@ -45,6 +45,7 @@ module Gem
           version: 'Target version: next [major|minor|patch|pre|release] or a given version number [x.x.x]',
           commit:  'Create a commit after incrementing gem version',
           message: 'Commit message template',
+          skip_ci: 'Add the [skip ci] tag to the commit message',
           push:    'Push the new commit to the git remote repository',
           remote:  'Git remote to push to (defaults to origin)',
           sign:    'GPG sign the commit message',
@@ -56,7 +57,7 @@ module Gem
 
         DEFAULTS = {
           commit:  true,
-          message: 'Bump to %{to} [skip ci]',
+          message: 'Bump to %{to} %{skip_ci}',
           push:    false,
           remote:  'origin'
         }
@@ -65,12 +66,16 @@ module Gem
           opts[:version] = value
         end
 
+        opt '-c', '--[no-]commit', DESCR[:commit] do |value|
+          opts[:commit] = value
+        end
+
         opt '-m', '--message', DESCR[:message] do |value|
           opts[:message] = value
         end
 
-        opt '-c', '--[no-]commit', DESCR[:commit] do |value|
-          opts[:commit] = value
+        opt '--skip-ci', DESCR[:skip_ci] do |value|
+          opts[:skip_ci] = value
         end
 
         opt '-p', '--[no-]push', DESCR[:push] do |value|
@@ -147,7 +152,7 @@ module Gem
 
           def commit
             cmd :git_add, version.path
-            cmd :git_commit, message, opts[:sign] ? '-S' : ''
+            cmd :git_commit, message.strip, opts[:sign] ? '-S' : ''
           end
 
           def push
@@ -167,7 +172,9 @@ module Gem
           end
 
           def message
-            opts[:message] % version.to_h
+            args = version.to_h
+            args = args.merge(skip_ci: opts[:skip_ci] ? '[skip ci]' : '')
+            opts[:message] % args
           end
 
           def version

data/lib/gem/release/cmds/runner.rb

@@ -28,7 +28,7 @@ module Gem
           end
 
           def success
-            context.announce "All is good, thanks my friend." unless quiet?
+            context.success "All is good, thanks my friend." unless quiet?
           end
 
           def quiet?

data/lib/gem/release/context.rb

@@ -46,6 +46,11 @@ module Gem
         puts colored(:red, with_spacing(str, true))
       end
 
+      def success(str)
+        announce(str)
+        puts
+      end
+
       def abort(str)
         error(str)
         exit 1
@@ -66,7 +71,7 @@ module Gem
         end
 
         def with_spacing(str, space)
-          space = false if self.class.last.nil?
+          # space = false if self.class.last.nil?
           str = "\n#{str}" if space && !self.class.last
           self.class.last = space
           str

data/lib/gem/release/support/gem_command.rb

@@ -58,13 +58,6 @@ module Gem
         abort
       end
 
-      def show_help
-        p "KEKSE"
-        exit
-        parser.program_name = usage
-        say parser
-      end
-
       def cmd
         self.class.cmd
       end

data/lib/gem/release/version.rb

@@ -1,5 +1,5 @@
 module Gem
   module Release
-    VERSION = '2.0.0.dev.3'
+    VERSION = '2.0.0.dev.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gem-release
 version: !ruby/object:Gem::Version
-  version: 2.0.0.dev.3
+  version: 2.0.0.dev.4
 platform: ruby
 authors:
 - Sven Fuchs