volley 0.1.0.alpha7 → 0.1.0.alpha8

data/conf/common.volleyfile

@@ -20,8 +20,7 @@ project :volley do
   end
   plan :latest do
     default do
-      ap args
-      (project,branch,version) = args.descriptor.get
+      (project,branch,_) = args.descriptor.get
       raise "project and branch must be specified" unless project && branch
 
       pub = Volley::Dsl.publisher

data/lib/volley/dsl/pull_action.rb

@@ -40,11 +40,6 @@ module Volley
           raise "failed to unpack: #{dir}/unpack" unless dir && File.directory?("#{dir}/unpack")
           yield "#{dir}/unpack"
         end
-
-        @plan.action :meta do
-          Volley.meta[project.name] = "#{args.descriptor.branch}:#{args.descriptor.version}"
-          Volley.meta.save
-        end
       end
     end
   end

data/lib/volley/publisher/amazons3.rb

@@ -109,7 +109,7 @@ module Volley
           hash[:all] ||= {}
           hash[:latest] ||= {}
           v = "#{pr}/#{br}/#{vr}"
-          hash[:latest]["#{pr}/#{br}"] ||= latest(pr, br)
+          #hash[:latest]["#{pr}/#{br}"] ||= latest(pr, br)
           hash[:all][v] = hash["latest"] == v
         end
         #ap hash

data/lib/volley/publisher/base.rb

@@ -10,6 +10,7 @@ module Volley
         @encrypted = optional(:encrypted, false)
         @local     = optional(:local, Volley.config.directory)
         @loglevel  = @debug ? :info : :debug
+        @latest    = {}
 
         load_configuration
       end
@@ -39,12 +40,12 @@ module Volley
       end
 
       def latest(project, branch)
-        v = pull_file(dir(project,branch), "latest")
-        "#{project}/#{branch}/#{v}"
+        @latest["#{project}/#{branch}"] ||= pull_file(dir(project,branch), "latest")
       end
 
       def volleyfile(project, branch, version="latest")
-        contents = pull_file(dir(project,branch,version), "Volleyfile")
+        d = dir(project,branch,version)
+        contents = pull_file(d, "Volleyfile")
 
         dest     = "#{@options[:local]}/Volleyfile-#{Time.now.to_i}-#{$$}"
         raise "File #{dest} already exists" if File.exists?(dest)
@@ -69,7 +70,7 @@ module Volley
           push_file(dir, "Volleyfile", File.open(Volley.config.volleyfile))
         end
 
-        push_file(dir(project, branch), "latest", version)
+        push_file(dir(project, branch), "latest", "#{project}/#{branch}/#{version}")
 
         true
       end
@@ -123,12 +124,12 @@ module Volley
       end
 
       def remote_file(branch, version)
-        version = version == 'latest' ? get_latest(project, branch) : version
+        version = version == 'latest' ? latest(project, branch) : version
         "#{branch}-#{version}.tgz#{".cpt" if @encrypted}"
       end
 
       def dir(project, branch, version=nil)
-        version = version == 'latest' ? get_latest(project, branch) : version
+        version = version == 'latest' ? latest(project, branch).split("/").last : version
         [project, branch, version].compact.join("/")
       end
 

data/lib/volley.rb

@@ -35,18 +35,14 @@ module Volley
       desc    = opts[:descriptor]
       second  = opts[:second]
 
-      project = nil
-      branch  = nil
-      version = nil
-
-      (project, plan) = plan.split(/:/) if plan =~ /\:/
-      (project, branch, version) = Volley::Descriptor.new(desc).get unless project
+      (runpr, plan) = plan.split(/:/) if plan =~ /\:/
+      (project, branch, version) = Volley::Descriptor.new(desc).get rescue [nil,nil,nil]
+      runpr ||= project
 
       begin
-        Volley::Log.debug "PROCESS plan:#{plan} descriptor:#{desc} args:#{args}"
-        if Volley::Dsl.project?(project)
+        if Volley::Dsl.project?(runpr)
           # we have the project locally
-          pr = Volley::Dsl.project(project)
+          pr = Volley::Dsl.project(runpr)
           if pr.plan?(plan)
             # plan is defined
             pl = pr.plan(plan)
@@ -57,6 +53,7 @@ module Volley
               Volley.meta[project] = data
             end
             Volley.meta.save
+            Volley::Log.debug "== #{runpr} = #{data}"
           else
             # plan is not defined
             raise "could not find plan #{plan} in project #{project}"
@@ -70,7 +67,7 @@ module Volley
               vf = pub.volleyfile(project, branch, version)
               Volley::Log.debug "downloaded volleyfile: #{vf}"
               Volley::Dsl::VolleyFile.load(vf)
-              process(:project => project, :plan => plan, :branch => branch, :version => version, :args => args, :second => true)
+              process(:plan => plan, :desc => desc, :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}.alpha7"
+  gem.version       = "#{Volley::Version::STRING}.alpha8"
 
   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.alpha7
+  version: 0.1.0.alpha8
   prerelease: 6
 platform: ruby
 authors: