asgit 0.0.4 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc550b94030a3e6bb0430a2880678522c6356cf2
-  data.tar.gz: cfa580b8bd83ac2a8b2f42abecb6ae6cb2d1d080
+  metadata.gz: 2d0990c0d9e5711c07321399d20e43a162d9abdc
+  data.tar.gz: d835ab6bc39cd6b1fce0c1feb2e84d0a666a70d0
 SHA512:
-  metadata.gz: d30037bfd83bffebb313c21ed15c826575fb24d469ff9378ab7a153f0bad396f1818a6aa54dc252e7639fd92c0aa0593f743057aa1e40fb6f69ebfa6481970d4
-  data.tar.gz: f32403eee3d40b47cf9ca4eacb67aa6f2259b18f88168db4ea352bc3e5389aa33914b20132ee84a16ba86e1e00685ea32b7a806ac14526e252bd6b5c6ca87635
+  metadata.gz: 9dfcd2bfc863483514cd09d289a1549b9eac37271d3f633e564eae1c152a6e91cf2fc645515f3f47862a23d960bb7be52b1637c48517ae10206d8985ccbc25da
+  data.tar.gz: 9683eaadfaad38cf876b4dd41200411e30b87836a962edc9ea45607347f99fd92a981d7bf240d5699f4697ce0c16045cef94e1432d797ac0ff0ebc02a2b8e049

data/lib/asgit/version.rb

@@ -1,3 +1,3 @@
 module Asgit
-  VERSION = "0.0.4"
+  VERSION = "0.0.7"
 end

data/lib/asgit.rb

@@ -9,16 +9,16 @@ module Asgit
     # Check if working tree is clean
     # @return [Boolean] true if branch is clean
     def working_tree_clean?
-      Shell.run "git status" do |output|
-        return output.include? "nothing to commit"
+      Shell.run "git status --porcelain" do |output|
+        return output.empty?
       end
     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" do |output|
-        return output.strip.gsub(/^refs\/heads\//, '')
+      Shell.run "git symbolic-ref HEAD --short" do |output|
+        return output.strip
       end
     end
 
@@ -33,8 +33,8 @@ module Asgit
     # Check if branch is in sync with remote
     # @return [Boolean]
     def remote_up_to_date?
-      status, stdout, stderr = Shell.run "git push --dry-run"
-      return status && stderr.include?( "Everything up-to-date" )
+      status, stdout, stderr = Shell.run "git push --dry-run --porcelain"
+      return status && stdout.match(/#{current_branch}\s+?\[up\sto\sdate\]/)
     end
 
   end

data/spec/asgit/config_spec.rb

@@ -51,7 +51,7 @@ describe Asgit::Config do
 
   describe "::configured?" do
     it "returns false if configuration hasn't been set" do
-      expect( Asgit.configured? ).to be_false
+      expect( Asgit.configured? ).to be_falsy
     end
 
     it "returns false if config is partially set" do
@@ -59,7 +59,7 @@ describe Asgit::Config do
         c.project = 'foo'
       end
 
-      expect( Asgit.configured? ).to be_false
+      expect( Asgit.configured? ).to be_falsy
     end
 
     it "returns true if configuration has been set" do
@@ -69,7 +69,7 @@ describe Asgit::Config do
         c.service      = :github
       end
 
-      expect( Asgit.configured? ).to be_true
+      expect( Asgit.configured? ).to be_truthy
     end
   end
 

data/spec/asgit_spec.rb

@@ -4,27 +4,23 @@ describe Asgit do
 
   describe "::working_tree_clean?" do
     it "is true when nothing to commit" do
-      Asgit::Shell.fake_stdout "# On branch master\n" +
-                               "nothing to commit, working directory clean" do
-        Asgit.working_tree_clean?.should be_true
+      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
     end
     it "is false when tree isn't clean" do
-      Asgit::Shell.fake_stdout "# On branch master\n" +
-                               "# Untracked files:\n" +
-                               "#   (use \"git add <file>...\" to include in what will be committed)\n" +
-                               "#\n" +
-                               "# foo\n" +
-                               "nothing added to commit but untracked files present (use \"git add\" to track)\n" do
-        Asgit.working_tree_clean?.should be_false
+      Asgit::Shell.fake_stdout "M changelog.md\n" do
+        expect( Asgit.working_tree_clean? ).to be_falsy
       end
     end
   end
 
   describe "::current_branch" do
     it "returns master when on master" do
-      Asgit::Shell.fake_stdout "refs/heads/master" do
-        Asgit.current_branch.should == "master"
+      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
     end
   end
@@ -32,21 +28,26 @@ describe Asgit do
   describe "::current_commit" do
     it "returns current commit" do
       Asgit::Shell.fake_stdout "12345" do
-        Asgit.current_commit.should == "12345"
+        expect( Asgit.current_commit ).to eq "12345"
       end
     end
   end
 
   describe "::remote_up_to_date?" do
     it "returns true if remote is current" do
-      Asgit::Shell.fake_stderr "Everything up-to-date" do
-        Asgit.remote_up_to_date?.should be_true
+      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
     end
     it "returns false if remote is out of sync" do
-      Asgit::Shell.fake_stderr "To git@github.com:mailchimp/statistrano.git\n" +
-                               "fbe7c67..3cf2934  HEAD -> master" do
-        Asgit.remote_up_to_date?.should be_false
+      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
     end
   end

data/spec/support/fake_stdout.rb

@@ -19,7 +19,7 @@ module Asgit
       def patched_run command, &block
         if @shell_out || @shell_err
           yield @shell_out if block_given?
-          [ true, @shell_out, @shell_err ]
+          [ true, @shell_out || '', @shell_err || '' ]
         else
           system_run command, &block
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asgit
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.7
 platform: ruby
 authors:
 - Steven Sloan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies: []
 description: ' A simple query interface for git. '
 email:
@@ -50,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A simple query interface for git