gemdiff 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8d9b69ba8b19e234495e6807c0b6617046fc6c1
-  data.tar.gz: 7afe601707ea661c706106b860572a7b5dfc4447
+  metadata.gz: 0a91837ca05f7dba3fc3eb2cefeac019346a9d3c
+  data.tar.gz: efeb3363bdf56d03c5b545f7243f41868bb14bd8
 SHA512:
-  metadata.gz: ad60a0e67b43aa9f4d34f0a0eef558e92709072061bfc541b332fb3dc62ba133d0ba7e36e04934f9eb1d717377376a0ccdfe5c7ecb5ef238d856ab9e45609106
-  data.tar.gz: 1bfe630c80b0b209f5109226ac0c06d1d4d1badc26f963f8d96547664996dc68c21d694aa9384d4c37322efad4be16b2d2a17dadd61a0d0a51017ec49c2d2a54
+  metadata.gz: 22961ac6e18e487fc6583291052c4ddecd19f584fc1a71055297a3f0bbfaf9311dc82ace8313378d353a09e56f8ed58143ff4e5796b6677262fdd71e06cbee1f
+  data.tar.gz: 15a9367f60bc852519a2bd453a21b11d71d02f476f5fbd38289b570b758ac2db8e263d672a683ed148483b5b17f3531a9bbed2895f126a16701a6502d6d9df41

data/README.md

@@ -42,10 +42,45 @@ Open? (y to open, else skip)
 
 You can use `gemdiff` bypassing bundler and query a gem by entering explicit version numbers.
 
-For example, open the GitHub compare view in browser for difference between `arel` versions 4.0.2 and 5.0.0:
+For example, open the GitHub compare view in browser for difference between `haml` versions 4.0.4 and 4.0.5:
 
 ```sh
-$ gemdiff compare arel --new=5.0.0 --old=4.0.2
+$ gemdiff compare haml --new=4.0.5 --old=4.0.4
+```
+
+### `update`
+
+`gemdiff` can simplify your git workflow around updating gems. Use `update` to update a gem in your
+bundle and commit the change to your repository. You will be shown a preview of the `git diff` and
+you may choose to commit or reset the change.
+
+```sh
+$ gemdiff update haml
+
+Updating haml...
+diff --git a/Gemfile.lock b/Gemfile.lock
+index d5544ef..2d5def8 100644
+--- a/Gemfile.lock
++++ b/Gemfile.lock
+@@ -38,7 +38,7 @@ GEM
+     dalli (2.7.0)
+     debugger-linecache (1.2.0)
+     erubis (2.7.0)
+-    haml (4.0.4)
++    haml (4.0.5)
+       tilt
+     hike (1.2.3)
+     i18n (0.6.9)
+
+Commit? (c to commit, r to reset, else do nothing) c
+
+commit ebcc13f4c9a43f2e844d9d185e527652021c6a8f
+Author: Tee Parham
+Date:   Mon Mar 3 16:38:32 2014 -0700
+
+    Update haml to 4.0.5
+
+diff --git a/Gemfile.lock
 ```
 
 ### `find`
@@ -53,8 +88,8 @@ $ gemdiff compare arel --new=5.0.0 --old=4.0.2
 Lookup the repository URL using the gemspec. If a GitHub URL is not found, hit the GitHub search API.
 
 ```sh
-$ gemdiff find arel
-http://github.com/rails/arel
+$ gemdiff find haml
+http://github.com/haml/haml
 ```
 
 ### `open`
@@ -62,7 +97,7 @@ http://github.com/rails/arel
 Open the repository URL:
 
 ```sh
-$ gemdiff open arel
+$ gemdiff open haml
 ```
 
 ### `releases`
@@ -70,7 +105,7 @@ $ gemdiff open arel
 Open the repository's release history page:
 
 ```sh
-$ gemdiff releases arel
+$ gemdiff releases haml
 ```
 
 ### `commits`
@@ -78,7 +113,7 @@ $ gemdiff releases arel
 Open the repository's master branch commit history page:
 
 ```sh
-$ gemdiff commits arel
+$ gemdiff commits haml
 ```
 
 ### `help`

data/lib/gemdiff.rb

@@ -1,5 +1,7 @@
 require 'gemdiff/version'
+require 'gemdiff/colorize'
 require 'gemdiff/cli'
 require 'gemdiff/bundle_inspector'
 require 'gemdiff/outdated_gem'
 require 'gemdiff/repo_finder'
+require 'gemdiff/gem_updater'

data/lib/gemdiff/bundle_inspector.rb

@@ -2,9 +2,8 @@ module Gemdiff
   class BundleInspector
     def list
       @list ||= begin
-        output = bundle_outdated_strict
         gems = []
-        output.split("\n").each do |line|
+        outdated.split("\n").each do |line|
           next unless (outdated_gem = new_outdated_gem(line))
           gems << outdated_gem
         end
@@ -12,6 +11,10 @@ module Gemdiff
       end
     end
 
+    def outdated
+      @outdated ||= bundle_outdated_strict
+    end
+
     def get(gem_name)
       list.select{ |gem| gem.name == gem_name }.first
     end

data/lib/gemdiff/cli.rb

@@ -2,8 +2,12 @@ require 'thor'
 
 module Gemdiff
   class CLI < Thor
+    include Colorize
+
     default_task :outdated
 
+    CHECKING_FOR_OUTDATED = "Checking for outdated gems in your bundle..."
+
     desc 'find <gem>', 'Find the github repository URL for a gem'
     def find(gem_name)
       gem = OutdatedGem.new(gem_name)
@@ -45,7 +49,7 @@ DESC
       return unless gem.repo?
       gem.set_versions options
       if gem.missing_versions?
-        puts "Checking for outdated gems in your bundle..."
+        puts CHECKING_FOR_OUTDATED
         unless gem.load_bundle_versions
           puts "#{gem_name} is not outdated in your bundle. Specify versions."
           return
@@ -57,13 +61,29 @@ DESC
 
     desc 'outdated', 'Compare each outdated gem in the bundle. You will be prompted to open each compare view.'
     def outdated
-      puts "Checking for outdated gems in your bundle..."
+      puts CHECKING_FOR_OUTDATED
       inspector = BundleInspector.new
+      puts inspector.outdated
       inspector.list.each do |gem|
         puts gem.compare_message
         response = ask("Open? (y to open, else skip)")
         gem.compare if response == 'y'
       end
     end
+
+    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)
+      gem.update
+      puts colorize_git_output(gem.diff)
+      response = ask("\nCommit? (c to commit, r to reset, else do nothing)")
+      if response == 'c'
+        gem.commit
+        puts "\n" + colorize_git_output(gem.show)
+      elsif response == 'r'
+        puts gem.reset
+      end
+    end
   end
 end

data/lib/gemdiff/colorize.rb

@@ -0,0 +1,44 @@
+module Gemdiff
+  module Colorize
+    COLORS =
+      {
+        red:     31,
+        green:   32,
+        yellow:  33,
+        blue:    34,
+        magenta: 35,
+      }
+
+    # works with `git show` and `git diff`
+    def colorize_git_output(lines)
+      out = []
+      lines.split("\n").each do |line|
+        out <<
+          if line.start_with?("---") || line.start_with?("+++") || line.start_with?("diff") || line.start_with?("index")
+            colorize line, :blue
+          elsif line.start_with?("@@")
+            colorize line, :magenta
+          elsif line.start_with?("commit")
+            colorize line, :yellow
+          elsif line.start_with?("-")
+            colorize line, :red
+          elsif line.start_with?("+")
+            colorize line, :green
+          else
+            line
+          end
+      end
+      out.join("\n")
+    end
+
+    def colorize(string, color)
+      "\e[#{to_color_code(color)}m#{string}\e[0m"
+    end
+
+  private
+
+    def to_color_code(color)
+      COLORS[color] || 30
+    end
+  end
+end

data/lib/gemdiff/gem_updater.rb

@@ -0,0 +1,64 @@
+module Gemdiff
+  class GemUpdater
+    attr_accessor :name
+
+    def initialize(name)
+      @name = name
+    end
+
+    def update
+      bundle_update
+    end
+
+    def diff
+      git_diff
+    end
+
+    def show
+      git_show
+    end
+
+    def commit
+      git_commit
+    end
+
+    def reset
+      git_reset
+    end
+
+  private
+
+    def git_show
+      `git show`
+    end
+
+    def git_diff
+      `git diff`
+    end
+
+    def git_commit
+      added = git_changed_line
+      return false if added.empty?
+      version = added.split(' ').last.gsub(/[()]/, '')
+      git_add_and_commit_lockfile version
+      true
+    end
+
+    def git_changed_line
+      `git diff | grep #{name} | grep '+  '`
+    end
+
+    def git_add_and_commit_lockfile(version)
+      `git add Gemfile.lock && git commit -m 'Update #{name} to #{version}'`
+    end
+
+    def git_reset
+      `git checkout Gemfile.lock`
+    end
+
+    def bundle_update
+      `bundle update #{name}`
+    end
+
+  end
+end

data/lib/gemdiff/version.rb

@@ -1,3 +1,3 @@
 module Gemdiff
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

data/test/cli_test.rb

@@ -0,0 +1,167 @@
+require 'test_helper'
+
+module Gemdiff
+  class CLITest < MiniTest::Spec
+    before do
+      @cli = CLI.new
+    end
+
+    describe "#find" do
+      it "finds" do
+        mock_gem "haml"
+        @cli.expects(:puts).with("http://github.com/haml/haml")
+        @cli.find "haml"
+      end
+
+      it "does not find" do
+        mock_missing_gem
+        @cli.expects(:puts).with("Could not find github repository for notfound.")
+        @cli.find "notfound"
+      end
+    end
+
+    describe "#open" do
+      it "opens repo" do
+        gem = mock_gem("haml")
+        @cli.expects(:puts).with("http://github.com/haml/haml")
+        gem.expects :open
+        @cli.open "haml"
+      end
+    end
+
+    describe "#releases" do
+      it "opens releases page" do
+        gem = mock_gem("haml")
+        @cli.expects(:puts).with("http://github.com/haml/haml")
+        gem.expects :releases
+        @cli.releases "haml"
+      end
+    end
+
+    describe "#commits" do
+      it "opens commits page" do
+        gem = mock_gem("haml")
+        @cli.expects(:puts).with("http://github.com/haml/haml")
+        gem.expects :commits
+        @cli.commits "haml"
+      end
+    end
+
+    describe "#compare" do
+      it "opens compare view" do
+        gem = mock_gem("haml")
+        gem.expects(:set_versions).with({})
+        gem.expects(:missing_versions?).returns(false)
+        gem.expects(:compare_message).returns("compare message")
+        @cli.expects(:puts).with("http://github.com/haml/haml")
+        @cli.expects(:puts).with("compare message")
+        gem.expects :compare
+        @cli.compare "haml"
+      end
+
+      it "returns when the gem is not found" do
+        mock_missing_gem
+        @cli.expects(:puts).with("Could not find github repository for notfound.")
+        @cli.compare "notfound"
+      end
+    end
+
+    describe "#outdated" do
+      it "does nothing when nothing to update" do
+        mock_inspector = mock do
+          stubs list: []
+          stubs outdated: ""
+        end
+        BundleInspector.stubs new: mock_inspector
+        @cli.expects(:puts).with(CLI::CHECKING_FOR_OUTDATED)
+        @cli.expects(:puts).with("")
+        @cli.outdated
+      end
+
+      it "compares outdated gems with responses of y" do
+        gem = OutdatedGem.new("haml", "4.0.4", "4.0.5")
+        mock_inspector = mock do
+          stubs list: [gem]
+          stubs outdated: "outdated"
+        end
+        BundleInspector.stubs new: mock_inspector
+        @cli.stubs ask: 'y'
+        @cli.expects(:puts).with(CLI::CHECKING_FOR_OUTDATED)
+        @cli.expects(:puts).with("outdated")
+        @cli.expects(:puts).with("haml: 4.0.5 > 4.0.4")
+        gem.expects :compare
+        @cli.outdated
+      end
+
+      it "skips outdated gems without responses of y" do
+        gem = OutdatedGem.new("haml", "4.0.4", "4.0.5")
+        mock_inspector = mock do
+          stubs list: [gem]
+          stubs outdated: "outdated"
+        end
+        BundleInspector.stubs new: mock_inspector
+        @cli.stubs ask: ''
+        @cli.expects(:puts).with(CLI::CHECKING_FOR_OUTDATED)
+        @cli.expects(:puts).with("outdated")
+        @cli.expects(:puts).with("haml: 4.0.5 > 4.0.4")
+        gem.expects(:compare).never
+        @cli.outdated
+      end
+    end
+
+    describe "#update" do
+      before do
+        @mock_gem = mock do
+          stubs diff: "le diff"
+          stubs show: "le show"
+        end
+        GemUpdater.stubs new: @mock_gem
+      end
+
+      it "updates the gem and returns with no response" do
+        @cli.stubs ask: ''
+        @cli.expects(:puts).with("Updating haml...")
+        @mock_gem.expects :update
+        @cli.expects(:puts).with("le diff")
+        @cli.update "haml"
+      end
+
+      it "updates the gem and commits with responses of c" do
+        @cli.stubs ask: 'c'
+        @cli.expects(:puts).with("Updating haml...")
+        @mock_gem.expects :update
+        @cli.expects(:puts).with("le diff")
+        @mock_gem.expects :commit
+        @cli.expects(:puts).with("\nle show")
+        @cli.update "haml"
+      end
+
+      it "updates the gem and resets with responses of r" do
+        @cli.stubs ask: 'r'
+        @cli.expects(:puts).with("Updating haml...")
+        @mock_gem.expects :update
+        @cli.expects(:puts).with("le diff")
+        @mock_gem.expects(:reset).returns("le reset")
+        @cli.expects(:puts).with("le reset")
+        @cli.update "haml"
+      end
+    end
+
+  private
+
+    def mock_gem(name)
+      gem = mock do
+        stubs repo?: true
+        stubs repo: "http://github.com/#{name}/#{name}"
+      end
+      OutdatedGem.stubs new: gem
+      gem
+    end
+
+    def mock_missing_gem
+      gem = mock { stubs repo?: false }
+      OutdatedGem.stubs new: gem
+      gem
+    end
+  end
+end

data/test/gem_updater_test.rb

@@ -0,0 +1,46 @@
+require 'test_helper'
+
+module Gemdiff
+  class GemUpdaterTest < MiniTest::Spec
+    describe "#update" do
+      it "updates the gem" do
+        updater = GemUpdater.new("x")
+        updater.expects :bundle_update
+        updater.update
+      end
+    end
+
+    describe "#commit" do
+      it "adds a git commit for a gem update" do
+        updater = GemUpdater.new("aws-sdk")
+        updater.stubs git_changed_line: "+    aws-sdk (1.35.0)"
+        updater.expects(:git_add_and_commit_lockfile).with("1.35.0")
+        assert updater.commit
+      end
+    end
+
+    describe "#reset" do
+      it "resets Gemfile.lock" do
+        updater = GemUpdater.new("x")
+        updater.expects :git_reset
+        updater.reset
+      end
+    end
+
+    describe "#diff" do
+      it "returns git diff" do
+        updater = GemUpdater.new("x")
+        updater.expects :git_diff
+        updater.diff
+      end
+    end
+
+    describe "#show" do
+      it "returns git show" do
+        updater = GemUpdater.new("x")
+        updater.expects :git_show
+        updater.show
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemdiff
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,10 +141,14 @@ files:
 - lib/gemdiff.rb
 - lib/gemdiff/bundle_inspector.rb
 - lib/gemdiff/cli.rb
+- lib/gemdiff/colorize.rb
+- lib/gemdiff/gem_updater.rb
 - lib/gemdiff/outdated_gem.rb
 - lib/gemdiff/repo_finder.rb
 - lib/gemdiff/version.rb
 - test/bundle_inspector_test.rb
+- test/cli_test.rb
+- test/gem_updater_test.rb
 - test/outdated_gem_test.rb
 - test/repo_finder_test.rb
 - test/test_helper.rb
@@ -174,6 +178,8 @@ specification_version: 4
 summary: Compare gem versions
 test_files:
 - test/bundle_inspector_test.rb
+- test/cli_test.rb
+- test/gem_updater_test.rb
 - test/outdated_gem_test.rb
 - test/repo_finder_test.rb
 - test/test_helper.rb