gem-release 2.0.0.dev.1 → 2.0.0.dev.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de3c02037630d812e94714ef4d9bd64d0cb05b1c
-  data.tar.gz: ac73a1c14c2cac5899f1e6589d5082ec20b50bb6
+  metadata.gz: 2eae2d6d553dc7f227a2d77d312478f9b350fc70
+  data.tar.gz: a9eb400332f183359a9607452f1988870a971765
 SHA512:
-  metadata.gz: 43770ee60ea5a82409423671417c88498a0abd6fddabe4a75297552447eb1e12e3ad63acbf3ed7586c1f6af69de9c4c656efd3f39847602aa793f11e9bcb4195
-  data.tar.gz: 643a26ffc6a0bb321a02b26481a7b8ced8689b1d9e3939f49dc333fb9137576404d52a73b00075f84c9b8ab7d493dee18379d32c5de72289a0b713538ceffa52
+  metadata.gz: 7f044bdc3f1e96aeb2e106efffbeb8f30e304f5d7d87ee26255c9e2d3a18c263ce219e2c6046c8bb3e155ecd708f50f56b209cd844e62ec3bed84a43e5c8d14e
+  data.tar.gz: a9411129a69515026f8a9fc51b0a64b216f1224f729ce61ff9345ea4c9075d84f0044cfa1a8cf1fd488c629138ea750659337ed9920496ce860710dc92fb6499

data/TODO.txt

@@ -1,23 +1,25 @@
 # Todo
 
-* Make it so that if no arg is given, we fallback to the first gemspec file
-  first. only if there's no gemspec file we use the dirname?
+- Add defaults to options help output [5]
+- Add specs for all error conditions [6]
+- Add a changelog [7]
 
-* Add a changelog
+- Make sure we don't double tag the same repo when several args are given [9]
 
-* Release and tag should fail if there are uncommitted changes
+x Release and tag should fail if there are uncommitted changes done:2017-05-01 [8]
   https://github.com/svenfuchs/gem-release/issues/34
 
-* Make sure we don't double tag the same repo when several args are given
-
-# Fix
+# Double check
 
-* Misleading success message
+x Misleading success message done:2017-05-01 [4]
   https://github.com/svenfuchs/gem-release/issues/60
+    Pushing foo-0.0.5.gem
+    Pushing gem to http://localhost:9292...
+    ...
+    ERROR:  While executing gem ... (Errno::ECONNREFUSED)
+        Failed to open TCP connection to localhost:9292 (Connection refused - connect(2) for "localhost" port 9292)
 
-# Double check
-
-- Issues with in-repo gems [1]
+x Issues with in-repo gems done:2017-05-01 [1]
   https://github.com/svenfuchs/gem-release/issues/58
 
 x bump fails when there is a space in the path to project done:2017-05-01 [2]
@@ -29,166 +31,9 @@ x bump fails when there is a space in the path to project done:2017-05-01 [2]
     gem bootstrap foo
     gem bump --no-push
 
-- gem bump --tag --release pushes the wrong version [3]
+x gem bump --tag --release pushes the wrong version done:2017-05-01 [3]
   https://github.com/svenfuchs/gem-release/issues/36
-
-# Refactor
-
-should create the directory foo, and cd into it
-
-  cd tmp
-  gem bootstrap foo
-
-
-should bootstrap a gem foo
-
-  cd foo
-  gem bootstrap
-
-should fail, as there's no foo.gemspec
-
-  cd tmp
-  gem bump foo
-
-should bump the first gemspec's gem, no matter the dir name
-
-  cd foo
-  gem bump
-
-# Scenario: Nested gem with conventional directory name
-
-### Setup
-
-```
-export GEM_RELEASE_PUSH=false
-cd /tmp
-rm -rf sinja
-gem bootstrap sinja
-cd sinja
-mkdir extensions
-cd extensions
-gem bootstrap sinja-sequel
-cd /tmp/sinja
-tree
-```
-
-### Directory structure
-
-```
-.
-├── Gemfile
-├── LICENSE.md
-├── extensions
-│   └── sinja-sequel
-│       ├── Gemfile
-│       ├── LICENSE.md
-│       ├── lib
-│       │   └── sinja
-│       │       ├── sequel
-│       │       │   └── version.rb
-│       │       └── sequel.rb
-│       └── sinja-sequel.gemspec
-├── lib
-│   ├── sinja
-│   │   └── version.rb
-│   └── sinja.rb
-└── sinja.gemspec
-```
-
-### Behaviour
-
-```
-# this bumps both sinja and sinja-sequel
-cd /tmp/sinja
-gem bump --recurse
-
-# this bumps sinja
-cd /tmp/sinja
-gem bump
-
-# this also bumps sinja
-cd /tmp/sinja
-gem bump sinja
-
-# this bumps sinja-sequel only
-cd /tmp/sinja
-gem bump sinja-sequel
-
-# this also bumps sinja-sequel only
-cd /tmp/sinja/extensions/sinja-sequel
-gem bump
-
-# this also bumps sinja-sequel only
-cd /tmp/sinja/extensions/sinja-sequel
-gem bump sinja-sequel
-```
-
-## Nested gem with irregular directory name
-
-### Setup
-
-```
-export GEM_RELEASE_PUSH=false
-cd /tmp
-rm -rf sinja
-gem bootstrap sinja
-cd sinja
-mkdir -p extensions
-cd extensions
-gem bootstrap sinja-sequel
-mv sinja-sequel sequel
-cd /tmp/sinja
-tree
-```
-
-### Directory structure
-
-```
-.
-├── Gemfile
-├── LICENSE.md
-├── extensions
-│   └── sequel
-│       ├── Gemfile
-│       ├── LICENSE.md
-│       ├── lib
-│       │   └── sinja
-│       │       ├── sequel
-│       │       │   └── version.rb
-│       │       └── sequel.rb
-│       └── sinja-sequel.gemspec
-├── lib
-│   ├── sinja
-│   │   └── version.rb
-│   └── sinja.rb
-└── sinja.gemspec
-```
-
-### Behaviour
-
-```
-# this bumps both sinja and sinja-sequel
-cd /tmp/sinja
-gem bump --recurse
-
-# this bumps sinja
-cd /tmp/sinja
-gem bump
-
-# this also bumps sinja
-cd /tmp/sinja
-gem bump sinja
-
-# this bumps sinja-sequel only
-cd /tmp/sinja
-gem bump sinja-sequel
-
-# this also bumps sinja-sequel only
-cd /tmp/sinja/extensions/sinja-sequel
-gem bump
-
-# this also bumps sinja-sequel only
-cd /tmp/sinja/extensions/sinja-sequel
-gem bump sinja-sequel
-```
-
+    $ gem bump --tag --release
+      Bumping foo from version 0.0.3 to 0.0.4
+      ...
+      Pushing foo-0.0.4.gem

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

@@ -53,7 +53,7 @@ module Gem
 
         DEFAULTS = {
           commit: true,
-          push:   true,
+          push:   false,
           remote: 'origin'
         }
 
@@ -86,13 +86,14 @@ module Gem
         end
 
         MSGS = {
-          not_found:  'Ignoring %s. Version file %s not found.',
-          no_remote:  'Cannot push to missing git remote %s.',
-          bump:       'Bumping %s from version %s to %s',
-          version:    'Changing version in %s from %s to %s',
-          git_add:    'Staging %s',
-          git_commit: 'Creating commit',
-          git_push:   'Pushing to the %s git repository'
+          bump:          'Bumping %s from version %s to %s',
+          version:       'Changing version in %s from %s to %s',
+          git_add:       'Staging %s',
+          git_commit:    'Creating commit',
+          git_push:      'Pushing to the %s git repository',
+          git_dirty:     'Uncommitted changes found. Please commit or stash.',
+          not_found:     'Ignoring %s. Version file %s not found.',
+          no_git_remote: 'Cannot push to missing git remote %s.'
         }
 
         CMDS = {
@@ -116,8 +117,9 @@ module Gem
         private
 
           def validate
-            abort :not_found, gem.name, version.path unless version.exists?
-            abort :no_remote, remote if push? && !git_remotes.include?(remote)
+            abort :git_dirty unless git_clean?
+            abort :not_found, gem.name, version.path || '?' unless version.exists?
+            abort :no_git_remote, remote if push? && !git_remotes.include?(remote.to_s)
           end
 
           def bump

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

@@ -46,10 +46,11 @@ module Gem
         end
 
         MSGS = {
-          release: 'Releasing %s with version %s',
-          build:   'Building %s',
-          push:    'Pushing %s',
-          cleanup: 'Deleting left over gem file %s'
+          release:   'Releasing %s with version %s',
+          build:     'Building %s',
+          push:      'Pushing %s',
+          cleanup:   'Deleting left over gem file %s',
+          git_dirty: 'Uncommitted changes found. Please commit or stash.',
         }
 
         CMDS = {
@@ -58,6 +59,7 @@ module Gem
 
         def run
           in_gem_dirs do
+            validate
             release
           end
           tag if opts[:tag]
@@ -65,6 +67,10 @@ module Gem
 
         private
 
+          def validate
+            abort :git_dirty unless git_clean?
+          end
+
           def release
             announce :release, gem.name, gem.version
             build

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

@@ -12,7 +12,7 @@ module Gem
         private
 
           def run_cmd
-            const.new(context.class.new, args, opts).run
+            const.new(context, args, opts).run
           end
 
           def const

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

@@ -46,6 +46,7 @@ module Gem
           git_tag:   'Creating git tag %s',
           git_push:  'Pushing tags to the %s git repository',
           no_remote: 'Cannot push to missing git remote %s',
+          git_dirty: 'Uncommitted changes found. Please commit or stash.',
         }
 
         CMDS = {
@@ -65,6 +66,7 @@ module Gem
         private
 
           def validate
+            abort :git_dirty unless git_clean?
             abort :no_remote, remote if push? && !git_remotes.include?(remote)
           end
 

data/lib/gem/release/context/system.rb

@@ -12,6 +12,10 @@ module Gem
           true
         end
 
+        def git_clean?
+          system 'git diff-index --quiet HEAD'
+        end
+
         def git_remotes
           `git remote`.split("\n")
         end

data/lib/gem/release/helper.rb

@@ -5,8 +5,8 @@ module Gem
     module Helper
       extend Forwardable
       def_delegators :context, :gem, :system
-      def_delegators :system, :git_remotes, :git_user_name, :git_user_email,
-        :github_user_name
+      def_delegators :system, :git_clean?, :git_remotes, :git_user_name,
+        :git_user_email, :github_user_name
 
       def run(cmd)
         return true if send(cmd)

data/lib/gem/release/version.rb

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

metadata

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