volley 0.1.0.alpha1 → 0.1.0.alpha2

data/Gemfile

@@ -4,3 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rake'
+gem 'templar'

data/lib/volley/dsl/plan.rb

@@ -60,16 +60,13 @@ module Volley
       def run_actions(*stages)
         stages = [*stages].flatten
         stages = [:pre, :main, :post] if stages.count == 0
-        #ap Volley.config if Volley.config.debug
         stages.each do |stage|
           Volley::Log.debug "running actions[:#{stage}]:" if @actions[stage].count > 0
           @actions[stage].each do |act|
             Volley::Log.debug "running action: #{act[:name]}"
-            #ap act if Volley.config.debug
             self.instance_eval(&act[:block])
           end
         end
-        #ap self if Volley.config.debug
       end
 
       def method_missing(n, *args)
@@ -227,6 +224,14 @@ module Volley
       end
 
       def pull
+        argument :branch, :required => true
+        argument :version, :default => "latest"
+
+        dir = nil
+        pub = nil
+        file = nil
+        tgz = nil
+
         action :download do
           pr = @project.name
           br = args.branch
@@ -237,14 +242,19 @@ module Volley
 
           dir = File.dirname(file)
           Volley::Log.info "changing directory: #{dir} (#{file})"
-          cmd = "volley run #{pr}:#{plan} branch:#{branch} #{arg_list.join(' ')}"
 
-          Volley::Log.info "command: #{cmd}"
+          #cmd = "volley run #{pr}:#{plan} branch:#{branch} #{arg_list.join(' ')}"
+          #Volley::Log.info "command: #{cmd}"
+        end
+        action :unpack do
           FileUtils.mkdir_p("#{dir}/unpack")
           Dir.chdir("#{dir}/unpack")
           tgz = %x{tar xvfz #{file} 2>/dev/null}
           File.open("#{dir}/tgz.log", "w") {|f| f.write(tgz)}
         end
+        action :run do
+          yield dir if dir
+        end
       end
 
       #def volley(opts={ })

data/lib/volley.rb

@@ -1,4 +1,4 @@
-require "awesome_print"
+#require "awesome_print"
 require "ostruct"
 require "active_support/all"
 
@@ -18,26 +18,31 @@ module Volley
       branch  = opts[:branch]
       version = opts[:version]
       args    = opts[:args]
+      second  = opts[:second]
 
       begin
+        Volley::Log.debug "PROCESS project:#{project} plan:#{plan} branch:#{branch} version:#{version} args:#{args}"
         if Volley::Dsl.project?(project)
           # we have the project locally
           pr = Volley::Dsl.project(project)
           if pr.plan?(plan)
             # plan is defined
             pl = pr.plan(plan)
-            pl.call(:rawargs => args)
+            pl.call(:rawargs => [args,"branch:#{branch}","version:#{version}"].flatten)
           else
             # plan is not defined
             raise "could not find plan #{plan} in project #{project}"
           end
         else
+          raise "second loop, downloaded volleyfile failed?" if second
           # we dont have the project locally, search the publisher
           pub = Volley::Dsl.publisher
           if pub
             if pub.projects.include?(project)
               vf = pub.volleyfile(opts)
-              puts "VF:#{vf}"
+              Volley::Log.debug "downloaded volleyfile: #{vf}"
+              Volley::VolleyFile.load(vf)
+              process(:project => project, :plan => plan, :branch => branch, :version => version, :args => args, :second => true)
             else
               raise "project #{project} does not exist in configured publisher #{pub.class}"
             end

data/volley.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "volley"
   gem.require_paths = ["lib"]
-  gem.version       = "#{Volley::Version::STRING}.alpha1"
+  gem.version       = "#{Volley::Version::STRING}.alpha2"
 
   gem.add_dependency "clamp"
   gem.add_dependency "fog"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: volley
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha1
+  version: 0.1.0.alpha2
   prerelease: 6
 platform: ruby
 authors: