volley 0.1.18 → 0.1.19

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v0.1.18:
+* 'volley:exists' plan to check for artifact in publisher
+
 ## v0.1.17:
 * fix problem with passing arguments through volley action
 * unable to get version is not a fatal error in most cases

data/bin/volley

@@ -112,7 +112,7 @@ module Volley
     rescue Docopt::Exit => e
       Volley::Log.info e.message
     rescue => e
-      Volley::Log.error "error: #{e} #{e.message} at #{e.backtrace.first}"
+      Volley::Log.error "error: '#{e.message}' at #{e.backtrace.first}"
       Volley::Log.debug e
       exit 1
     end

data/conf/common.volleyfile

@@ -46,6 +46,17 @@ project :volley do
     end
   end
 
+  plan :released, remote: false do
+    argument :project, required: true
+    default do
+      p = args.project
+      pub = Volley::Dsl.publisher
+      r = pub.latest_release(p)
+
+      puts "latest '#{p}' release: #{r}"
+    end
+  end
+
   plan :versions, :remote => false do
     argument :all, :convert => :boolean, :default => false
     argument :output, :default => "list", :convert => :to_sym, :choices => ["json", "xml", "list"]
@@ -120,6 +131,45 @@ project :volley do
     end
   end
 
+  plan :release do
+    argument :version, required: true
+    localfile = nil
+    reldesc = nil
+    tmpdir = "/var/tmp/volley-%d-%d-%05d" % [Time.now.to_i, $$, rand(99999)]
+    pub = Volley::Dsl.publisher
+
+    action :mktmp do
+      FileUtils.mkdir_p(tmpdir)
+      Dir.chdir(tmpdir)
+    end
+    action :download do
+      desc = args.descriptor
+      to = args.version
+      reldesc = Descriptor.new("#{desc.project}@release:#{to}")
+      puts "#{desc} => #{reldesc}"
+      (p, b, v) = desc.get
+      localfile = pub.pull(p, b, v)
+      log "downloaded: #{localfile}"
+    end
+    action :release do
+      (p, b, v) = reldesc.get
+      pub.release(tmpdir, localfile, p, b, v)
+    end
+    action :cleanup do
+      FileUtils.remove_entry_secure(tmpdir)
+    end
+  end
+
+  plan :download do
+    default do
+      desc = args.descriptor
+      pub = Volley::Dsl.publisher
+      (p, b, v) = desc.get
+      f = pub.pull(p, b, v)
+      log "downloaded: #{f}"
+    end
+  end
+
   plan :exists, :remote => false do
     default do
       (project, branch, version) = args.descriptor.get

data/lib/volley/descriptor.rb

@@ -13,7 +13,7 @@ module Volley
         @branch = nil
         @version = nil
 
-        list = desc.split(/[\@\:\.\/\\\-]/)
+        list = desc.split(/[\@\:\/\\\-]/)
         raise "error parsing descriptor: #{desc}" if (list.count < 2 || list.count > 4) && !@options[:partial]
 
         (@project, @branch, @version, @after) = list

data/lib/volley/dsl/plan.rb

@@ -67,7 +67,7 @@ module Volley
         rescue ExecutionStopped => e
           Volley::Log.debug "stopping execution at #{e.backtrace.first}"
         rescue => e
-          puts "plan#call error: #{e.message} at #{e.backtrace.first}"
+          Volley::Log.debug "plan#call error: #{e.message} at #{e.backtrace.first}"
           raise e
         end
         [branch, version].join(":")

data/lib/volley/dsl/push_action.rb

@@ -8,6 +8,9 @@ module Volley
         @stage = options.delete(:stage)
         @plan = options.delete(:plan)
         @options = {
+            project: nil,
+            branch: nil,
+            version: nil,
         }.merge(options)
         raise "stage instance must be set" unless @stage
         raise "plan instance must be set" unless @plan
@@ -104,7 +107,7 @@ module Volley
 
         @plan.action :push, :post do
           publisher = Volley::Dsl.publisher
-          publisher.push(project.name, branch, version, attributes.artifact)
+          publisher.push(options[:project] || project.name, options[:branch] || branch, options[:version] || version, attributes.artifact)
         end
       end
     end

data/lib/volley/publisher/amazons3.rb

@@ -22,7 +22,7 @@ module Volley
         pr = project.to_s
         r = files[:desc][pr].keys || [] rescue []
         Volley::Log.info "could not find #{pr}" unless r.count > 0
-        r
+        r.reject {|e| ["latest_release"].include?(e)}
       rescue => e
         Volley::Log.warn "error getting branch list from publisher: #{e.message}"
         []
@@ -33,7 +33,7 @@ module Volley
         br = branch.to_s
         r = files[:desc][pr][br].keys || [] rescue []
         Volley::Log.info "could not find #{pr}@#{br}" unless r.count > 0
-        r.reject { |e| e == "latest" || e == "" }
+        r.reject { |e| ["","latest","latest_release"].include?(e) }
       rescue => e
         Volley::Log.warn "error getting version list from publisher: #{e.message}"
         []

data/lib/volley/publisher/base.rb

@@ -78,6 +78,10 @@ module Volley
         latest(project, branch).split("/").last
       end
 
+      def latest_release(project)
+        pull_file(project, "latest_release")
+      end
+
       def volleyfile(project, branch, version="latest")
         d        = dir(project, branch, version)
         contents = pull_file(d, "Volleyfile")
@@ -121,6 +125,25 @@ module Volley
         "#@local/#{dir}/#{file}"
       end
 
+      def release(tmpdir, local, p, b, v)
+        Dir.chdir(tmpdir) do
+          packed = "#{b}-#{v}.tgz"
+          dest = dir(p, b, v)
+
+          system("tar xfz #{local}")
+
+          files = Dir["**"]
+
+          system("tar cfz #{packed} #{files.join(" ")}")
+          push_file(dest, packed, File.open(packed))
+          push_file(dest, "Volleyfile", File.open("Volleyfile")) if File.exists?("Volleyfile")
+          push_file(dir(p, b), "latest", "#{p}/#{b}/#{v}")
+          push_file(p, "latest_release", "#{p}/#{b}/#{v}")
+        end
+
+        true
+      end
+
       protected
 
       def me

data/lib/volley/publisher/local.rb

@@ -12,13 +12,13 @@ module Volley
       end
 
       def branches(pr)
-        Dir["#@directory/#{pr}/*"].map {|e| e.gsub(/#@directory\/#{pr}\//,"")}
+        Dir["#@directory/#{pr}/*"].map {|e| e.gsub(/#@directory\/#{pr}\//,"")}.reject {|e| ["latest_release"].include?(e)}
       end
 
       def versions(pr, br)
         Dir["#@directory/#{pr}/#{br}/*"].map do |e|
           e.gsub(/#@directory\/#{pr}\/#{br}\//,"")
-        end.reject {|e| e == "latest" || e == ""}
+        end.reject { |e| ["","latest","latest_release"].include?(e) }
       end
 
       def exists?(project, branch, version)

data/lib/volley/version.rb

@@ -3,7 +3,7 @@ unless defined?(Volley::Version)
     module Version
       MAJOR  = 0
       MINOR  = 1
-      TINY   = 18
+      TINY   = 19
       TAG    = nil
       STRING = [MAJOR, MINOR, TINY, TAG].compact.join('.')
     end

data/spec/descriptor_spec.rb

@@ -31,6 +31,7 @@ describe Volley::Descriptor do
     spec
     spec:
     spec~trunk
+    spec.trunk.1
   }.each do |desc|
     it "should not handle format: '#{desc}'" do
       expect { Volley::Descriptor.new(desc) }.to raise_error(StandardError)

data/spec/publisher_spec.rb

@@ -33,7 +33,18 @@ shared_examples_for Volley::Publisher::Base do
   end
 
   it "should fail to retrieve a missing artifact" do
-    expect{ @pub.pull("spec", "trunk", "15")}.to raise_error(Volley::Publisher::ArtifactMissing)
+    expect { @pub.pull("spec", "trunk", "15") }.to raise_error(Volley::Publisher::ArtifactMissing)
+  end
+
+  it "should be able to release an artifact" do
+    tmpdir = "#{Dir.pwd}/test/tmp"
+    FileUtils.mkdir_p(tmpdir)
+    Dir.chdir(tmpdir) do
+      local  = @pub.pull("spec", "trunk", "1")
+      expect(@pub.release(tmpdir, local, "spec", "release", "v1.0")).to be(true)
+      expect(@pub.versions("spec", "release")).to match_array(%w{v1.0})
+    end
+    FileUtils.remove_entry_secure(tmpdir)
   end
 
   it "should be able to tell me the list of projects" do
@@ -41,7 +52,7 @@ shared_examples_for Volley::Publisher::Base do
   end
 
   it "should be able to tell me the list of branches" do
-    expect(@pub.branches("spec")).to match_array(%w{trunk staging})
+    expect(@pub.branches("spec")).to match_array(%w{release trunk staging})
   end
 
   it "should be able to tell me the list of versions" do
@@ -49,14 +60,14 @@ shared_examples_for Volley::Publisher::Base do
   end
 
   it "should be able to tell me the list of files" do
-    expect(@pub.contents("spec","trunk","2")).to match_array(%w{trunk-1.tgz})
+    expect(@pub.contents("spec", "trunk", "2")).to match_array(%w{trunk-1.tgz})
   end
 
   it "should be able to get a remote volleyfile" do
     Dir.chdir("#{root}/test/project")
-    expect(@pub.push("spec","trunk","3","Volleyfile")).to eq(true)
+    expect(@pub.push("spec", "trunk", "3", "Volleyfile")).to eq(true)
     Dir.chdir(root)
-    expect(@pub.volleyfile("spec","trunk","3")).to match(/#@local\/Volleyfile-.*-.*/)
+    expect(@pub.volleyfile("spec", "trunk", "3")).to match(/#@local\/Volleyfile-.*-.*/)
   end
 
   it "should be able to tell me the latest of a project and branch" do
@@ -69,7 +80,7 @@ shared_examples_for Volley::Publisher::Base do
 
   it "should be able to force publish a duplicate artifact" do
     Dir.chdir("#{root}/test/")
-    o = @pub.force
+    o          = @pub.force
     @pub.force = true
     expect(@pub.push("spec", "trunk", "1", "./trunk-1.tgz")).to eq(true)
     @pub.force = o

data/volley.gemspec

@@ -13,14 +13,13 @@ 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}"
+  gem.version       = Volley::Version::STRING
 
   gem.add_dependency "clamp"
   gem.add_dependency "fog"
   gem.add_dependency "activesupport"
   gem.add_dependency "mixlib-shellout"
   gem.add_dependency "yell"
-  gem.add_dependency "docopt", '0.5.0'
+  gem.add_dependency "docopt"
   gem.add_dependency "daemons"
-  gem.add_dependency "awesome_print"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: volley
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -93,22 +93,6 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: docopt
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: daemons
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -124,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: daemons
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -215,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4434554969566022621
+      hash: 974353220657797386
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -224,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4434554969566022621
+      hash: 974353220657797386
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24