agile_check_in 0.0.2 → 0.0.3

data/lib/agile_check_in.rb

@@ -1,54 +1,60 @@
 require "agile_check_in/version"
+require "agile_check_in/git"
 require "yaml"
 
 module AgileCheckIn
   def self.incremental
     pair_names = ""
     story_number = ""
-
-    history_file = '/tmp/agile_check_in_history.yml'
-    if File.exists?(history_file)
-      shove_history = YAML::load(File.open(history_file))["shove"]
-      pair_names    = shove_history["pair"]
-      story_number  = shove_history["story"]
-    end
-
-    begin
-      $stdout.write "Pair names (separated with '/') [#{pair_names}]: "
-      input = $stdin.gets.strip
-      pair_names = input unless input.empty?
-    end until !pair_names.empty?
-
-    begin
-      $stdout.write "Story number [#{story_number}]: "
-      input = $stdin.gets.strip
-      story_number = input unless input.empty?
-    end until !story_number.empty?
-
-    File.open(history_file, 'w') do |out|
-      YAML.dump({ "shove" => { "pair" => pair_names, "story" => story_number } }, out)
+    
+    if Git.has_local_changes?
+      history_file = '/tmp/agile_check_in_history.yml'
+      if File.exists?(history_file)
+        shove_history = YAML::load(File.open(history_file))["shove"]
+        pair_names    = shove_history["pair"]
+        story_number  = shove_history["story"]
+      end
+
+      begin
+        $stdout.write "Pair names (separated with '/') [#{pair_names}]: "
+        input = $stdin.gets.strip
+        pair_names = input unless input.empty?
+      end until !pair_names.empty?
+
+      begin
+        $stdout.write "Story number [#{story_number}]: "
+        input = $stdin.gets.strip
+        story_number = input unless input.empty?
+      end until !story_number.empty?
+
+      File.open(history_file, 'w') do |out|
+        YAML.dump({ "shove" => { "pair" => pair_names, "story" => story_number } }, out)
+      end
+
+      commit_message = "[#{pair_names} - ##{story_number}] "
+
+      system("git add -A")
+      system("EDITOR=vim git commit -e -m '#{commit_message}'")
+    else
+      puts "No local changes to commit."
     end
 
-    commit_message = "[#{pair_names} - ##{story_number}] "
-
-    system("git add -A")
-    system("EDITOR=vim git commit -e -m '#{commit_message}'")
   end
 
   def self.push_and_test
     puts "*******"
     puts "About to test these changes:"
-    puts `git log origin/develop..HEAD`
+    puts Git.local_commits
     puts "*******"
 
 
     if system("rake spec")
       puts "*******"
       puts "About to push these changes:"
-      puts `git log origin/develop..HEAD`
+      puts Git.local_commits
       puts "*******"
       puts "Shoving..."
-      system("git push origin develop")
+      system("git push")
     else
       puts "Tests failed. Shove aborted."
       exit(1)

data/lib/agile_check_in/git.rb

@@ -0,0 +1,19 @@
+module AgileCheckIn
+  module Git
+    def self.current_branch
+      `git branch --no-color 2> /dev/null`.split("\n")
+                                          .select{ |branch| branch.match(/\* /) }
+                                          .first
+                                          .split("* ")
+                                          .last
+    end
+    
+    def self.local_commits
+      `git log origin/#{current_branch}..HEAD`
+    end
+    
+    def self.has_local_changes?
+      !`git status`.match(/working directory clean/)
+    end
+  end
+end

data/lib/agile_check_in/version.rb

@@ -1,3 +1,3 @@
 module AgileCheckIn
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: agile_check_in
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -31,6 +31,7 @@ files:
 - bin/ci
 - bin/cii
 - lib/agile_check_in.rb
+- lib/agile_check_in/git.rb
 - lib/agile_check_in/version.rb
 homepage: ''
 licenses: []