dandelion 0.2.2 → 0.2.3

data/README.md

@@ -15,17 +15,17 @@ Alternatively, you can build the gem yourself:
     
 Config
 ------
-Configuration options are specified in a YAML file (Dandelion looks for 
-`dandelion.yml` by default). Example:
+Configuration options are specified in a YAML file (the root of your Git repository
+is searched for a file named `dandelion.yml` by default). Example:
 
     # Required
     scheme: sftp
     host: example.com
     username: user
     password: pass
-    path: path/to/deployment
     
     # Optional
+    path: path/to/deployment
     exclude:
         - .gitignore
         - dandelion.yml
@@ -53,7 +53,7 @@ Optional: `path`, `exclude`
 
 Usage
 -----
-From the root directory of a Git repository, run:
+From within your Git repository, run:
 
     $ dandelion deploy
     
@@ -68,11 +68,17 @@ files which have changed since the last deployment need to be transferred.
 For a more complete summary of usage options, run:
 
     $ dandelion -h
-    Usage: dandelion [options] [[command] [options]]
+    Usage: dandelion [options] [[command] [options]] [config_file]
         -v, --version                    Display the current version
         -h, --help                       Display this screen
             --repo=[REPO]                Use the given repository
 
     Available commands:
         deploy
-        status
+        status
+
+Or:
+
+    $ dandelion COMMAND -h
+
+To see the options for a given command.

data/lib/dandelion/cli.rb

@@ -9,11 +9,9 @@ require 'yaml'
 module Dandelion
   module Cli
     class Options
-      attr_reader :config_file
-      
       def initialize
         @options = {}
-        @config_file = 'dandelion.yml'
+        @config_file = nil
         @global = global_parser
         @commands = { 'deploy' => deploy_parser, 'status' => status_parser }
         @commands_help = "\nAvailable commands:\n    #{@commands.keys.join("\n    ")}"
@@ -47,8 +45,20 @@ module Dandelion
         @options[key] = value
       end
       
+      def config_file
+        @config_file || File.join(@options[:repo], 'dandelion.yml')
+      end
+      
       private
       
+      def closest_repo(dir)
+        if File.exists?(File.join(dir, '.git'))
+          dir
+        else
+          File.dirname(dir) != dir && closest_repo(File.dirname(dir))
+        end
+      end
+      
       def global_parser
         OptionParser.new do |opts|
           opts.banner = 'Usage: dandelion [options] [[command] [options]]'
@@ -64,7 +74,7 @@ module Dandelion
             exit
           end
           
-          @options[:repo] = '.'
+          @options[:repo] = closest_repo(File.expand_path('.'))
           opts.on('--repo=[REPO]', 'Use the given repository') do |repo|
             @options[:repo] = repo
           end

data/lib/dandelion/version.rb

@@ -1,3 +1,3 @@
 module Dandelion
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dandelion
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-25 00:00:00.000000000 -04:00
+date: 2011-06-08 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &2157532620 !ruby/object:Gem::Requirement
+  requirement: &2153656700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *2157532620
+  version_requirements: *2153656700
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2157532120 !ruby/object:Gem::Requirement
+  requirement: &2153656200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *2157532120
+  version_requirements: *2153656200
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &2157531660 !ruby/object:Gem::Requirement
+  requirement: &2153683620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 2.0.5
   type: :development
   prerelease: false
-  version_requirements: *2157531660
+  version_requirements: *2153683620
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &2157531200 !ruby/object:Gem::Requirement
+  requirement: &2153683160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2157531200
+  version_requirements: *2153683160
 description: Incremental Git repository deployment
 email:
 - scottbnel@gmail.com
@@ -135,7 +135,7 @@ rubyforge_project:
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: dandelion-0.2.2
+summary: dandelion-0.2.3
 test_files:
 - test/fixtures/diff
 - test/fixtures/ls_tree