propel 0.1.0 → 0.1.1

data/lib/propel/configuration.rb

@@ -1,7 +1,8 @@
 module Propel
   class Configuration
-    def initialize(command_line_arguments)
+    def initialize(command_line_arguments, repository)
       @command_line_options = command_line_arguments
+      @repository = repository
     end
 
     DEFAULTS = {
@@ -15,6 +16,10 @@ module Propel
       DEFAULTS.merge(parse(options_from_config_file).merge(parse @command_line_options))
     end
 
+    def config_file
+      File.join(@repository.project_root, ".propel")
+    end
+    
     private
     def options_from_config_file
       File.exist?(config_file) ? File.read(config_file).split : [ ]
@@ -23,9 +28,5 @@ module Propel
     def parse(option_array)
       Propel::OptionParser.parse!(option_array)
     end
-
-    def config_file
-      './.propel'
-    end
   end
 end

data/lib/propel/git_repository.rb

@@ -4,6 +4,10 @@ module Propel
       new.changed?
     end
 
+    def project_root
+      git("rev-parse --show-toplevel")
+    end
+
     def changed?
       local_last_commit != remote_last_commit
     end

data/lib/propel/runner.rb

@@ -1,13 +1,12 @@
 module Propel
   class Runner
     def initialize(args = [ ])
-      @options = Configuration.new(args).options
+      @repository = GitRepository.new
+      @options = Configuration.new(args, @repository).options
     end
 
     def start
-      git_repository = GitRepository.new
-
-      if git_repository.changed?
+      if @repository.changed?
         if remote_build_configured?
           check_remote_build! unless ignore_remote_build?
 
@@ -17,7 +16,7 @@ module Propel
 
         propel!
       else
-        puts "There is nothing to propel - your HEAD is identical to #{git_repository.remote_config} #{git_repository.merge_config}."
+        puts "There is nothing to propel - your HEAD is identical to #{@repository.remote_config} #{@repository.merge_config}."
       end
     end
 

data/lib/propel/version.rb

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

data/spec/propel/configuration_spec.rb

@@ -3,24 +3,34 @@ require 'spec_helper'
 describe Propel::Configuration do
   describe "#options" do
     it "should prefer options given on the command line over options in a configuration file" do
-      configuration = Propel::Configuration.new(['--rebase'])
+      configuration = Propel::Configuration.new(['--rebase'], Propel::GitRepository.new)
       configuration.stub!(:options_from_config_file).and_return(['--no-rebase'])
 
       configuration.options[:rebase].should be_true
     end
 
     it "should not overwrite options from config file with defaults" do
-      configuration = Propel::Configuration.new([])
+      configuration = Propel::Configuration.new([], Propel::GitRepository.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 = Propel::Configuration.new([], Propel::GitRepository.new)
       configuration.stub!(:options_from_config_file).and_return([])
 
       configuration.options.should == { :rebase => true, :force => false, :verbose => false, :wait => false}
     end    
   end
+
+  describe "#config_file" do
+    it "should return a file located in the project root" do
+      git_repository = Propel::GitRepository.new
+      git_repository.stub!(:project_root).and_return('/foo/testdirectory')
+
+      configuration = Propel::Configuration.new([], git_repository)
+      configuration.config_file.should == '/foo/testdirectory/.propel'
+    end
+  end
 end

data/spec/propel/git_repository_spec.rb

@@ -11,6 +11,13 @@ describe Propel::GitRepository do
     end
   end
 
+  describe "#project_root" do
+    it "should return the root of the project" do
+      project_root = File.expand_path(File.join(File.dirname(__FILE__), %w[ .. .. ]))
+      Propel::GitRepository.new.project_root.should == project_root
+    end
+  end
+  
   describe "#changed?" do
     it "should return false when the remote branch has the same SHA1 as the local HEAD" do
       git_repository = Propel::GitRepository.new

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: propel
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Justin Leitgeb
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-01 00:00:00 -05:00
+date: 2011-05-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency