do 0.1.0 → 0.1.1

data/CHANGES.md

@@ -1,3 +1,12 @@
+## 0.1.1 - August 14, 2011
+
+* Remove rake dependency
+* Simpler way to manage remote servers
+* Simpler way to manage local machine
+* Argument parser
+* Fixed problem with ordered hash
+* Allow to run dependencies in same contest
+
 ## 0.0.2 - August 9, 2011
 
 * Added `doit do:setup` task that generate a template in `~./do/dorc`

data/lib/do/commands.rb

@@ -96,7 +96,7 @@ module DO
     def plugin(name, repo)
       desc "install #{name} plugin"
       namespace :plugin do
-        task(name => :setup) do
+        task(name => 'setup') do
           log "\e[36m## Installing plugin %s\e[0m" % name
           Dir.mkdir(DO_PATH) unless File.exist?(DO_PATH)
           path = File.join(DO_PATH, '%s.rake' % name)

data/lib/do/tasks.rb

@@ -20,15 +20,22 @@ module DO
     end
 
     def task(name, options={},  &block)
-      name, deps = name.is_a?(Hash) ? [name.keys[0], Array(name.values[0])] : [name, []]
-      tasks << options.merge({
+      name, deps, options = *case name
+        when Hash
+          in_was = name.delete(:in)
+          name_and_deps = name.shift
+          name.merge!(:in => in_was) if in_was
+          name_and_deps.push(name)
+        else [name, [], options]
+      end
+      tasks.push(options.merge({
         :name      => name.to_s,
         :desc      => @_desc.to_s,
-        :deps      => deps,
+        :deps      => Array(deps),
         :namespace => @_namespace.to_s,
         :block     => block,
         :in        => Array(options[:in])
-      })
+      }))
       tasks[-1]
     ensure
       @_desc = nil
@@ -38,7 +45,10 @@ module DO
       args_was = args.dup
       task = task_find(args.shift)
       opts = DO::Parser.new(*args)
-      task[:deps].each { |d| task_run(*args.unshift(d).push('--dependency')) }
+      task[:deps].each do |dep|
+        name = dep.is_a?(Symbol) && task[:namespace] != '' ? '%s:%s' % [task[:namespace], dep] : dep
+        task_run(*args.unshift(name).push('--dependency'))
+      end
       if task[:in].empty?
         task[:block].arity == 1 ? task[:block].call(opts) : task[:block].call if task[:block]
       else

data/lib/do/version.rb

@@ -1,3 +1,3 @@
 module DO
-  VERSION = "0.1.0" unless defined?(DO::VERSION)
+  VERSION = "0.1.1" unless defined?(DO::VERSION)
 end

data/spec/commands_spec.rb

@@ -153,5 +153,18 @@ describe DO::Commands do
       end
       cmd.task_run(:hostname, '--srv1')
     end
+
+    it 'should handle deps' do
+      cmd.server :sho0, 'sho0.lipsiasoft.biz', 'root', :keys => Dir['/Developer/keys/*.pem']
+      cmd.task(:dep){ @a=1 }
+      cmd.task :hostname => :dep, :in => :remote do |options|
+        cmd.run('hostname').should match(/sho0/)
+        @a.should == 1
+      end
+      cmd.tasks[-1][:name].should == 'hostname'
+      cmd.tasks[-1][:deps].should == [:dep]
+      cmd.tasks[-1][:in].should == [:remote]
+      cmd.task_run(:hostname)
+    end
   end # DO::Server
 end # DO::Commands

data/spec/tasks_spec.rb

@@ -150,5 +150,14 @@ describe DO::Tasks do
       cmd.task(:demo => :demos)
       expect { cmd.task_run(:demo) }.to_not raise_error
     end
+
+    it 'should resolve dependency namespace' do
+      cmd.tasks.clear
+      cmd.namespace :ns do
+        cmd.task(:foo){@a=1}
+        cmd.task(:bar => :foo){ @a.should == 1 }
+      end
+      cmd.run_task('ns:bar')
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Davide D'Agostino
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-14 00:00:00 +02:00
+date: 2011-08-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency