propel 0.0.4 → 0.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    propel (0.0.4)
+    propel (0.1.0)
       json
 
 GEM

data/README.md

@@ -24,3 +24,8 @@ passing as of the latest commit for Jenkins, Team City and CI Joe.
 
 Once you figure out the options that work for you, just put a .propel file in the root of your project.
 Command line parameters override the options found in the configuration file.
+
+## Credits
+
+Thanks to Jose Carrion (http://joselo.github.com/) for pair programming with me for several hours during the
+development of Propel.

data/lib/propel/configuration.rb

@@ -4,8 +4,15 @@ module Propel
       @command_line_options = command_line_arguments
     end
 
+    DEFAULTS = {
+        :force    => false,
+        :rebase   => true,
+        :verbose  => false,
+        :wait     => false
+    }
+
     def options
-      parse(options_from_config_file).merge(parse @command_line_options)
+      DEFAULTS.merge(parse(options_from_config_file).merge(parse @command_line_options))
     end
 
     private

data/lib/propel/option_parser.rb

@@ -17,28 +17,23 @@ module Propel
       ::OptionParser.new do |parser|
         parser.banner = "Usage: propel [options]\n\n"
         
-        options[:force] = false
-        options[:rebase] = true
-        options[:verbose] = false
-        options[:wait] = false
-
         parser.on('-s', '--status-url STATUS_URL', 'Location of build status feed') do |build_status_url|
           options[:status_url] = build_status_url
         end
 
-        parser.on('-f', '--[no-]force', 'Use propel --force to ignore any remote build failures') do |o|
+        parser.on('-f', '--[no-]force', 'Ignores any remote build failures') do |o|
           options[:force] = o
         end
 
-        parser.on('-r', '--[no-]rebase', 'Use propel --no-rebase. Defaults to --rebase') do |o|
+        parser.on('-r', '--[no-]rebase', 'Determines whether or not pull uses rebase.  Propel uses rebase by default.') do |o|
           options[:rebase] = o
         end
 
-        parser.on('-w', '--[no-]wait', 'Wait for the remote build to pass if it is currently failing.  Use propel --wait.') do |o|
+        parser.on('-w', '--[no-]wait', 'Waits for fixes to remote build') do |o|
           options[:wait] = o
         end
 
-        parser.on('-v', '--verbose', 'Use propel --verbose.') do |o|
+        parser.on('-v', '--verbose', 'Shows extra information') do |o|
           options[:verbose] = o
         end
       end

data/lib/propel/remote_build.rb

@@ -10,9 +10,9 @@ module Propel
     end
 
     FAIL_PATTERNS = {
-        :jenkins => /\(broken/,
-        :team_city => /(?:has failed)$/,
-        :ci_joe => /^failed$/
+        :jenkins    => /\(broken/,
+        :team_city  => /(?:has failed)$/,
+        :ci_joe     => /^failed$/
     }
 
     def passing?

data/lib/propel/version.rb

@@ -1,3 +1,3 @@
 module Propel
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/propel.gemspec

@@ -6,16 +6,15 @@ Gem::Specification.new do |s|
   s.name        = "propel"
   s.version     = Propel::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Justin Leitgeb", "Jose Carrion"]
-  s.email       = ["justin@stackbuilders.com", "jcarrion@stackbuilders.com"]
+  s.authors     = ["Justin Leitgeb"]
+  s.email       = ["justin@stackbuilders.com"]
   s.homepage    = "http://github.com/stackbuilders/propel"
   s.summary     = "Propel helps you to follow best practices for pushing code to a remote git repo"
   s.description = <<-EOS
-    The 'propel' script helps you to push your code to a remote server while following best practices,
-    especially in regard to Continuous Integration (CI).  Propel first checks the CI server to make sure
-    it's passing, and then runs the local spec suite and pushes changes.  If the remote server is failing,
-    you can tell propel to wait until it passes, and then proceed to run your build and push if the local
-    build passes.
+    The 'propel' script helps you to push your code to a remote server while following Continuous Integration (CI)
+    best practices.  Propel first checks the CI server to make sure it's passing, and then runs the local spec
+    suite and pushes changes.  If the remote server is failing, just have propel wait for it to pass while you get
+    a coffee.
   EOS
 
   s.files         = `git ls-files`.split("\n")

data/spec/propel/configuration_spec.rb

@@ -8,5 +8,19 @@ describe Propel::Configuration do
 
       configuration.options[:rebase].should be_true
     end
+
+    it "should not overwrite options from config file with defaults" do
+      configuration = Propel::Configuration.new([])
+      configuration.stub!(:options_from_config_file).and_return(['--wait'])
+
+      configuration.options[:wait].should be_true
+    end
+
+    it "should set default options" do
+      configuration = Propel::Configuration.new([])
+      configuration.stub!(:options_from_config_file).and_return([])
+
+      configuration.options.should == { :rebase => true, :force => false, :verbose => false, :wait => false}
+    end    
   end
 end

data/spec/propel/option_parser_spec.rb

@@ -2,10 +2,6 @@ require 'spec_helper'
 
 describe Propel::OptionParser do
   describe ".parse!" do
-    it "should set default options" do
-      Propel::OptionParser.parse!.should == {:rebase => true, :force => false, :verbose => false, :wait => false}
-    end
-
     it "should set force to true when given as an option" do
       Propel::OptionParser.parse!(['--force'])[:force].should be_true
     end

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: propel
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 4
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors: 
 - Justin Leitgeb
-- Jose Carrion
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -49,10 +48,9 @@ dependencies:
         version: 2.5.0
   type: :development
   version_requirements: *id002
-description: "    The 'propel' script helps you to push your code to a remote server while following best practices,\n    especially in regard to Continuous Integration (CI).  Propel first checks the CI server to make sure\n    it's passing, and then runs the local spec suite and pushes changes.  If the remote server is failing,\n    you can tell propel to wait until it passes, and then proceed to run your build and push if the local\n    build passes.\n"
+description: "    The 'propel' script helps you to push your code to a remote server while following Continuous Integration (CI)\n    best practices.  Propel first checks the CI server to make sure it's passing, and then runs the local spec\n    suite and pushes changes.  If the remote server is failing, just have propel wait for it to pass while you get\n    a coffee.\n"
 email: 
 - justin@stackbuilders.com
-- jcarrion@stackbuilders.com
 executables: 
 - propel
 extensions: []