git-storyid 0.1.2 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/git-storyid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "git-storyid"
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = "2012-09-04"
+  s.date = "2013-02-09"
   s.description = "Helps include pivotal story id and description in commit"
   s.email = "agresso@gmail.com"
   s.executables = ["git-storyid"]
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/bogdan/git-storyid"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.24"
   s.summary = "Attach commits to pivotal stories"
 
   if s.respond_to? :specification_version then

data/lib/git_storyid.rb

@@ -2,6 +2,7 @@ require "readline"
 require "optparse"
 require "pivotal_tracker"
 require "yaml"
+require "open3"
 
 class GitStoryid
 
@@ -34,7 +35,7 @@ class GitStoryid
   end
 
   def run
-    if `git diff --staged`.empty?
+    if execute("git", "diff", "--staged").empty?
       puts "No changes staged to commit."
       exit 1
     end
@@ -61,7 +62,11 @@ class GitStoryid
       message += @message.to_s + "\n\n"
     end
     message += @stories.map {|s| "Feature: " + s.name.strip}.join("\n\n")
-    puts `git commit -m "#{message}"`
+    puts execute("git", "commit", "-m", message)
+  end
+
+  def execute(*args)
+    Open3.popen3(*args) {|i, o| return o.read }
   end
 
 
@@ -70,13 +75,21 @@ class GitStoryid
     class << self
     def read
       return if @loaded
+      load_config
+      ensure_full_config
+      setup_api_client
+      @loaded = true
+    end
+
+    def load_config
       @config = load_config_from(global_config_path)
       @project_config = load_config_from(project_config_path)
       @config.merge!(@project_config)
-      ensure_full_config
+    end
+
+    def setup_api_client
       PivotalTracker::Client.token = @config['api_token']
       PivotalTracker::Client.use_ssl = @config['use_ssl'] ? @config['use_ssl'] : false
-      @loaded = true
     end
 
     def ensure_full_config
@@ -90,14 +103,7 @@ class GitStoryid
         if @config[key].nil?
           changed = true
           value = Readline.readline("#{label}: ", true) 
-          @project_config[key]  = case value
-                                  when "y"
-                                    true
-                                  when "n"
-                                    false
-                                  else
-                                    value
-                                  end
+          @project_config[key]  = format_config_value(value)
         end
       end
       if changed
@@ -109,6 +115,17 @@ class GitStoryid
       end
     end
 
+    def format_config_value(value)
+      case value
+      when "y"
+        true
+      when "n"
+        false
+      else
+        value
+      end
+    end
+
     def load_config_from(path)
       return {} unless path
       file = File.join path,'.pivotalrc'

data/spec/git_storyid_spec.rb

@@ -1,7 +1,14 @@
 require "spec_helper"
+require "fileutils"
 
 describe GitStoryid do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
+
+  before(:each) do
+    FileUtils.rm_rf("spec/repo")
+    FileUtils.mkdir_p("spec/repo")
+    FileUtils.cd("spec/repo")
+    `git init`
   end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-storyid
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2013-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pivotal-tracker
-  requirement: &8514840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8514840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &8512340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *8512340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &8524860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +53,12 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *8524860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.3
 description: Helps include pivotal story id and description in commit
 email: agresso@gmail.com
 executables:
@@ -82,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 956355888598505054
+      hash: -1277588774395316013
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -91,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Attach commits to pivotal stories