asgit 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c28ffc8cb032e8af5e3ea65f5056accba05ce982
-  data.tar.gz: 561a141bde4cf33c7202b11b742b982e1d2408b0
+  metadata.gz: 8f89a149b2ac9d40a18e93a6f80da4e394901046
+  data.tar.gz: ac6a95bce8a86080ff057908c97ad9ee654e980a
 SHA512:
-  metadata.gz: ab9a787571aba61904b6107a683ccdba5e0d835fa17163904e8ef3b05ab08b5f8f0f0d2136a8b5263932fb4e35bc8b1c96f4b1ad82363dc8b4bf42137cb7326c
-  data.tar.gz: 0fad5d6dc5debb3d57a15a0d0a5a98c8e70bd12db3fcf79bf697a3db8c4733629efc1a3f042577ea8e0a0dc30008fb2466520b05c070eeae14c12daff0369441
+  metadata.gz: d7ad454da449e915d67ea0346ce7b3eaf017ccedb2cd51c78f302309a0d5c7db0ec87536b401771bef72c4aeb4112d1e218c14f9a435e31167e5c9bc56a004aa
+  data.tar.gz: d3775c9813be77c6921fc378fa50ba316201ca86b53637cf6d8e2910e15b0dc9af988841df6f1aadc05484b4a0dc5bef4564abf4b22030d92461f24ecd4fdf4d

data/lib/asgit/shell.rb

@@ -1,28 +1,13 @@
-require 'open3'
+require 'here_or_there'
 
 module Asgit
   module Shell
-
     class << self
 
-      def run command, &block
-        stdout, stderr, status = Open3.capture3(command)
-
-        if status.success?
-          yield stdout if block_given?
-          [ true, stdout, stderr ]
-        else
-          $stderr.puts "Problem running #{command}"
-          $stderr.puts stderr
-          [ false, stdout, stderr ]
-        end
-      rescue StandardError => e
-        $stderr.puts "Problem running '#{command}'"
-        $stderr.puts "#{e.message}"
-        $stderr.puts "#{e.backtrace}"
+      def run command
+        HereOrThere::Local.new.run command
       end
 
     end
-
   end
 end

data/lib/asgit/version.rb

@@ -1,3 +1,3 @@
 module Asgit
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/lib/asgit.rb

@@ -9,32 +9,26 @@ module Asgit
     # Check if working tree is clean
     # @return [Boolean] true if branch is clean
     def working_tree_clean?
-      Shell.run "git status --porcelain" do |output|
-        return output.empty?
-      end
+      Shell.run( "git status --porcelain" ).stdout.empty?
     end
 
     # Get current git branch based on exec directory
     # @return [String] the current checked out branch
     def current_branch
-      Shell.run "git symbolic-ref HEAD --short" do |output|
-        return output.strip
-      end
+      Shell.run( "git symbolic-ref HEAD --short" ).stdout.strip
     end
 
     # Get current git commit based on exec directory
     # @return [String] the current commit level
     def current_commit
-      Shell.run "git rev-parse HEAD" do |output|
-        return output.strip
-      end
+      Shell.run( "git rev-parse HEAD" ).stdout.strip
     end
 
     # Check if branch is in sync with remote
     # @return [Boolean]
     def remote_up_to_date?
-      status, stdout, stderr = Shell.run "git push --dry-run --porcelain"
-      return status && stdout.match(/#{current_branch}\s+?\[up\sto\sdate\]/)
+      resp = Shell.run "git push --dry-run --porcelain"
+      return resp.success? && resp.stdout.match(/#{current_branch}\s+?\[up\sto\sdate\]/)
     end
 
   end

data/spec/lib/asgit/shell_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Asgit::Shell do
+  describe "::run" do
+    it "calls HereOrThere::Local#run with the provided command" do
+      expect_any_instance_of(HereOrThere::Local).to receive(:run)
+                                                .with('ls')
+
+      Asgit::Shell.run 'ls'
+    end
+  end
+end

data/spec/lib/asgit_spec.rb

@@ -4,51 +4,45 @@ describe Asgit do
 
   describe "::working_tree_clean?" do
     it "is true when nothing to commit" do
-      expect( Asgit::Shell ).to receive(:run).with('git status --porcelain').and_call_original
-      Asgit::Shell.fake_stdout "" do
-        expect( Asgit.working_tree_clean? ).to be_truthy
-      end
+      stub_shell 'git status --porcelain'
+      expect( Asgit.working_tree_clean? ).to be_truthy
     end
     it "is false when tree isn't clean" do
-      Asgit::Shell.fake_stdout "M changelog.md\n" do
-        expect( Asgit.working_tree_clean? ).to be_falsy
-      end
+      stub_shell 'git status --porcelain', stdout: "M changelog.md\n"
+      expect( Asgit.working_tree_clean? ).to be_falsy
     end
   end
 
   describe "::current_branch" do
     it "returns master when on master" do
-      expect( Asgit::Shell ).to receive(:run).with('git symbolic-ref HEAD --short').and_call_original
-      Asgit::Shell.fake_stdout "master\n" do
-        expect( Asgit.current_branch ).to eq "master"
-      end
+      stub_shell 'git symbolic-ref HEAD --short', stdout: "master\n"
+      expect( Asgit.current_branch ).to eq "master"
     end
   end
 
   describe "::current_commit" do
     it "returns current commit" do
-      Asgit::Shell.fake_stdout "12345" do
-        expect( Asgit.current_commit ).to eq "12345"
-      end
+      stub_shell 'git rev-parse HEAD', stdout: 'commit_sha'
+      expect( Asgit.current_commit ).to eq 'commit_sha'
     end
   end
 
   describe "::remote_up_to_date?" do
     it "returns true if remote is current" do
-      Asgit::Shell.fake_stdout "To git@github.com:stevenosloan/asgit.git\n" +
-                               "=\tHEAD:refs/heads/master\t[up to date]\n" +
-                               "Done\n" do
-        allow( Asgit ).to receive(:current_branch).and_return("master")
-        expect( Asgit.remote_up_to_date? ).to be_truthy
-      end
+      stub_shell 'git push --dry-run --porcelain',
+                  stdout: "To git@github.com:stevenosloan/asgit.git\n" +
+                          "=\tHEAD:refs/heads/master\t[up to date]\n" +
+                          "Done\n"
+      allow( Asgit ).to receive(:current_branch).and_return("master")
+      expect( Asgit.remote_up_to_date? ).to be_truthy
     end
     it "returns false if remote is out of sync" do
-      Asgit::Shell.fake_stdout "To git@github.com:stevenosloan/asgit.git\n" +
-                               "\tHEAD:refs/heads/master\t5871eb5..0ce6c7f\n" +
-                               "Done\n" do
-        allow( Asgit ).to receive(:current_branch).and_return("master")
-        expect( Asgit.remote_up_to_date? ).to be_falsy
-      end
+      stub_shell 'git push --dry-run --porcelain',
+                 stdout: "To git@github.com:stevenosloan/asgit.git\n" +
+                         "\tHEAD:refs/heads/master\t5871eb5..0ce6c7f\n" +
+                         "Done\n"
+      allow( Asgit ).to receive(:current_branch).and_return("master")
+      expect( Asgit.remote_up_to_date? ).to be_falsy
     end
   end
 

data/spec/spec_helper.rb

@@ -3,22 +3,26 @@ require 'pry-debugger'
 
 require 'asgit'
 
-require 'support/fake_stdout'
+require 'support/stubbed_shell'
 require 'support/eat_stdout'
 
+RSpec.configure do |config|
+  config.include StubbedShell
+end
+
 describe "spec_helper" do
-  describe "Asgit::Shell.fake_stdout" do
+  describe "stub_shell" do
     it "overrides the actual stdout for Asgit::Shell" do
-      Asgit::Shell.fake_stdout "woo" do
-        expect( Asgit::Shell.run("foo")[1] ).to eq "woo"
-      end
+      stub_shell 'foo', stdout: 'woo'
+      expect( Asgit::Shell.run('foo').stdout ).to eq 'woo'
     end
-  end
-  describe "Asgit::Shell.fake_stderr" do
     it "overrides the actual stderr for Asgit::Shell" do
-      Asgit::Shell.fake_stderr "woo" do
-        expect( Asgit::Shell.run("foo")[2] ).to eq "woo"
-      end
+      stub_shell 'foo', stderr: 'woo'
+      expect( Asgit::Shell.run('foo').stderr ).to eq 'woo'
+    end
+    it "overrides the actual status for Asgit::Shell" do
+      stub_shell 'foo', status: false
+      expect( Asgit::Shell.run('foo').success? ).to be_falsy
     end
   end
 end

data/spec/support/stubbed_shell.rb

@@ -0,0 +1,11 @@
+module StubbedShell
+  def stub_shell command, options={}
+    stdout = options.fetch(:stdout, '')
+    stderr = options.fetch(:stderr, '')
+    status = options.fetch(:status, true)
+
+    expect( Asgit::Shell ).to receive(:run)
+                          .with(command)
+                          .and_return( HereOrThere::Response.new( stdout, stderr, status ) )
+  end
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: asgit
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Steven Sloan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-31 00:00:00.000000000 Z
-dependencies: []
+date: 2014-01-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: here_or_there
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: ' A simple query interface for git. '
 email:
 - stevenosloan@gmail.com
@@ -17,22 +31,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/asgit.rb
 - lib/asgit/project.rb
+- lib/asgit/services.rb
 - lib/asgit/services/bitbucket.rb
 - lib/asgit/services/github.rb
 - lib/asgit/services/service.rb
-- lib/asgit/services.rb
 - lib/asgit/shell.rb
 - lib/asgit/url.rb
 - lib/asgit/version.rb
-- lib/asgit.rb
 - spec/lib/asgit/project_spec.rb
 - spec/lib/asgit/services_spec.rb
+- spec/lib/asgit/shell_spec.rb
 - spec/lib/asgit/url_spec.rb
 - spec/lib/asgit_spec.rb
 - spec/spec_helper.rb
 - spec/support/eat_stdout.rb
-- spec/support/fake_stdout.rb
+- spec/support/stubbed_shell.rb
 homepage: http://github.com/stevenosloan/asgit
 licenses:
 - MIT
@@ -53,15 +68,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A simple query interface for git
 test_files:
 - spec/lib/asgit/project_spec.rb
 - spec/lib/asgit/services_spec.rb
+- spec/lib/asgit/shell_spec.rb
 - spec/lib/asgit/url_spec.rb
 - spec/lib/asgit_spec.rb
 - spec/spec_helper.rb
 - spec/support/eat_stdout.rb
-- spec/support/fake_stdout.rb
+- spec/support/stubbed_shell.rb

data/spec/support/fake_stdout.rb

@@ -1,48 +0,0 @@
-module Asgit
-  module Shell
-    class << self
-
-      def fake_stdout out
-        set_stdout out
-        yield
-      ensure
-        unset_stdout
-      end
-
-      def fake_stderr err
-        set_stderr err
-        yield
-      ensure
-        unset_stderr
-      end
-
-      def patched_run command, &block
-        if @shell_out || @shell_err
-          yield @shell_out if block_given?
-          [ true, @shell_out || '', @shell_err || '' ]
-        else
-          system_run command, &block
-        end
-      end
-
-      def set_stdout out
-        @shell_out = out
-      end
-
-      def unset_stdout
-        @shell_out = nil
-      end
-
-      def set_stderr err
-        @shell_err = err
-      end
-
-      def unset_stderr
-        @shell_err = nil
-      end
-
-      alias_method :system_run, :run
-      alias_method :run, :patched_run
-    end
-  end
-end