propel 0.3.1 → 0.3.2

data/Gemfile.lock

@@ -1,14 +1,12 @@
 PATH
   remote: .
   specs:
-    propel (0.3.0)
-      colored
+    propel (0.3.2)
       json
 
 GEM
   remote: http://rubygems.org/
   specs:
-    colored (1.2)
     diff-lcs (1.1.2)
     json (1.5.1)
     rspec (2.5.0)

data/lib/propel/configuration.rb

@@ -3,7 +3,7 @@ module Propel
 
     def initialize(command_line_arguments, repository)
       @command_line_options = command_line_arguments
-      @repository = repository
+      @repository           = repository
     end
 
     DEFAULTS = {
@@ -19,22 +19,26 @@ module Propel
       correct_color_setting!(opts)
     end
 
+    def config_file
+      File.join(@repository.project_root, ".propel")
+    end
+    
+    private
     def correct_color_setting!(opts)
-      if opts[:color_enabled] && RUBY_PLATFORM =~ /mswin|mingw/
+      if opts[:color] && ruby_platform =~ /mswin|mingw/
         unless ENV['ANSICON']
           warn "You must use ANSICON 1.31 or later (http://adoxa.110mb.com/ansicon/) to use colour on Windows"
           opts[:color] = false
         end
       end
-      
+
       opts
     end
 
-    def config_file
-      File.join(@repository.project_root, ".propel")
+    def ruby_platform
+      RUBY_PLATFORM
     end
-    
-    private
+
     def options_from_config_file
       File.exist?(config_file) ? File.read(config_file).split : [ ]
     end

data/lib/propel/option_parser.rb

@@ -16,30 +16,30 @@ module Propel
     def parser(options)
       ::OptionParser.new do |parser|
         parser.banner = "Usage: propel [options]\n\n"
-        
-        parser.on('-s', '--status-url STATUS_URL', 'Location of build status feed') do |build_status_url|
-          options[:status_url] = build_status_url
+
+        parser.on('-c', '--[no-]color', '--[no-]colour', 'Turn on or off colored output. Color is off by default.') do |o|
+          options[:color] = o
         end
 
         parser.on('-f', '--fix-ci', 'Use when fixing the CI build') do |o|
           options[:fix_ci] = o
         end
 
+        parser.on('-q', '--[no-]quiet', 'Silences normal output messages.') do |o|
+          options[:quiet] = o
+        end
+
         parser.on('-r', '--[no-]rebase', 'Use pull with --rebase.  Rebase is used by default.') do |o|
           options[:rebase] = o
         end
 
-        parser.on('-c', '--[no-]color', '--[no-]colour', 'Turn on or off colored output. Color is off by default.') do |o|
-          options[:color] = o
+        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('-w', '--[no-]wait', 'Waits for fixes to remote build.') do |o|
           options[:wait] = o
         end
-
-        parser.on('-q', '--[no-]quiet', 'Silences normal output messages.') do |o|
-          options[:quiet] = o
-        end
       end
     end
   end

data/lib/propel/version.rb

@@ -1,3 +1,3 @@
 module Propel
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/propel/configuration_spec.rb

@@ -21,7 +21,14 @@ describe Propel::Configuration do
       configuration.stub!(:options_from_config_file).and_return([])
 
       configuration.options.should == { :rebase => true, :fix_ci => false, :verbose => false, :wait => false, :color => false }
-    end    
+    end
+
+    it "should correct the color setting if on a Windows 32 system that does not support color" do
+      configuration = Propel::Configuration.new(['--color', '--quiet'], Propel::GitRepository.new)
+      configuration.stub(:ruby_platform).and_return('mswin')
+      configuration.stub!(:warn)
+      configuration.options[:color].should be_false
+    end
   end
 
   describe "#config_file" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: propel
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Justin Leitgeb