gemdiff 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05a404d4d18549814615ecb9a1a02bab2c467bc9
-  data.tar.gz: 324693252dd101a19f2c7cad72487731f6c83353
+  metadata.gz: d99d8f54e658c4b0e91ba163f040ea78949b8f87
+  data.tar.gz: a463b1e9ff73296086f5634df1d7d64655a01fd2
 SHA512:
-  metadata.gz: 7a15acfc4346304062941911e3b0e46ef969180ef2c7e8265a4f523149e1550199bcf456b649f436e90e12a379a396d9aef74d9555ff8fe4376c8138e4b87613
-  data.tar.gz: 38b2b7a4c67d98c6ed986375a59718402d3a6190c35e62fc0bac538296eaca63b9490bf5af224564b46d04d4c5e7478eddb56ca5c9ef04eb4e9eb6d5f200dd52
+  metadata.gz: 70491a4633618f6d4e6ea23a931980d2ab37a58c580389dc9115989195c3662adb3e56cd8b00681fc52d39dd74154a4b7db40519e789670e3a9f90def9d0c496
+  data.tar.gz: 76d6ebb39cb15f2f137bb9e05de68e98af6e629ed63b6dc199ffb8f9de035847c26f5084524fcfcc01621cf3bf3f577259b5eae2e9b88a9f45bd306ce3e22e5e

data/gemdiff.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 1.9.3"
 
   spec.add_dependency "bundler", "~> 1.5"
-  spec.add_dependency "highline", "~> 1.6"
   spec.add_dependency "octokit", "~> 2.7"
   spec.add_dependency "thor", "~> 0.18"
 

data/lib/gemdiff/cli.rb

@@ -2,11 +2,14 @@ require 'thor'
 
 module Gemdiff
   class CLI < Thor
+    include Thor::Actions
     include Colorize
 
     default_task :outdated
 
     CHECKING_FOR_OUTDATED = "Checking for outdated gems in your bundle..."
+    NOTHING_TO_UPDATE = "Nothing to update."
+    WORKING_DIRECTORY_IS_NOT_CLEAN = "Your working directory is not clean. Please commit or stash before updating."
 
     desc 'find <gem>', 'Find the github repository URL for a gem'
     def find(gem_name)
@@ -71,10 +74,18 @@ DESC
 
     desc 'update <gem>', 'Update a gem, show a git diff of the update, and commit or reset'
     def update(name)
-      puts "Updating #{name}..."
       gem = GemUpdater.new(name)
+      unless gem.clean?
+        puts WORKING_DIRECTORY_IS_NOT_CLEAN
+      end
+      puts "Updating #{name}..."
       gem.update
-      puts colorize_git_output(gem.diff)
+      diff_output = colorize_git_output(gem.diff)
+      puts diff_output
+      if diff_output.empty?
+        puts NOTHING_TO_UPDATE
+        return
+      end
       response = ask("\nCommit? (c to commit, r to reset, else do nothing)")
       if response == 'c'
         gem.commit

data/lib/gemdiff/gem_updater.rb

@@ -26,6 +26,10 @@ module Gemdiff
       git_reset
     end
 
+    def clean?
+      git_diff.empty?
+    end
+
   private
 
     def git_show

data/lib/gemdiff/repo_finder.rb

@@ -14,6 +14,7 @@ module Gemdiff
         activemodel:   'rails/rails',
         activerecord:  'rails/rails',
         activesupport: 'rails/rails',
+        delayed_job:   'collectiveidea/delayed_job',
         railties:      'rails/rails',
         resque:        'resque/resque',
       }

data/lib/gemdiff/version.rb

@@ -1,3 +1,3 @@
 module Gemdiff
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/test/cli_test.rb

@@ -125,6 +125,7 @@ module Gemdiff
     describe "#update" do
       before do
         @mock_gem = mock do
+          stubs clean?: true
           stubs diff: "le diff"
           stubs show: "le show"
         end

data/test/gem_updater_test.rb

@@ -42,5 +42,20 @@ module Gemdiff
         updater.show
       end
     end
+
+    describe "#clean?" do
+      it "returns true for empty diff" do
+        updater = GemUpdater.new("x")
+        updater.stubs git_diff: ""
+        assert updater.clean?
+      end
+
+      it "returns false for non-empty diff" do
+        updater = GemUpdater.new("x")
+        updater.stubs git_diff: "something"
+        refute updater.clean?
+      end
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemdiff
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Tee Parham
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement