volley 0.1.19 → 0.1.20

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v0.1.19:
+* gemspec had hardcoded tag
+* add release functionality to publishers
+* remove puts call
+
 ## v0.1.18:
 * 'volley:exists' plan to check for artifact in publisher
 

data/conf/common.volleyfile

@@ -52,6 +52,11 @@ project :volley do
       p = args.project
       pub = Volley::Dsl.publisher
       r = pub.latest_release(p)
+      list = pub.versions(p, "release")
+      list.each do |v|
+        f = pub.released_from(p, v) || "unknown" rescue "unknown"
+        puts "  #{v} <= #{f}"
+      end
 
       puts "latest '#{p}' release: #{r}"
     end
@@ -133,30 +138,14 @@ project :volley do
 
   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
+    default 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)
+      old = desc.to_s
+      new = "#{desc.project}@release:#{to}"
+      pub.release(old, new)
     end
   end
 

data/lib/volley/publisher/base.rb

@@ -3,7 +3,7 @@ module Volley
     class Base
       attr_accessor :force
 
-      def initialize(options={ })
+      def initialize(options={})
         @options = {
             :overwrite => false,
         }.merge(options)
@@ -12,24 +12,24 @@ module Volley
         @encrypted = optional(:encrypted, false)
         @local     = optional(:local, Volley.config.directory)
         @loglevel  = @debug ? :info : :debug
-        @latest    = { }
+        @latest    = {}
         @force     = false
 
         load_configuration
       end
 
       def list(&block)
-        hash     = { }
-        unsorted = { }
+        hash     = {}
+        unsorted = {}
         plist    = projects
         plist.each do |p|
-          hash[p] = { }
+          hash[p] = {}
           blist   = branches(p)
           blist.each do |b|
-            hash[p][b] = { }
+            hash[p][b] = {}
             vlist      = versions(p, b)
             vlist.each do |v|
-              d = version_data(p, b, v)
+              d             = version_data(p, b, v)
               hash[p][b][v] = d
               unsorted["#{p}@#{b}:#{v}"] = d if d[:contents] && d[:contents].count > 0
             end
@@ -82,6 +82,10 @@ module Volley
         pull_file(project, "latest_release")
       end
 
+      def released_from(project, version)
+        pull_file(dir(project, "release", version), "from")
+      end
+
       def volleyfile(project, branch, version="latest")
         d        = dir(project, branch, version)
         contents = pull_file(d, "Volleyfile")
@@ -125,25 +129,58 @@ 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)
+      def release(old, new)
+        odesc = Descriptor.new(old)
+        ndesc = Descriptor.new(new)
+
+        Dir.mktmpdir("volley-#{$$}", "/var/tmp") do |tmpdir|
+          Dir.chdir(tmpdir) do
+            (op, ob, ov) = odesc.get
+            (p, b, v)    = ndesc.get
+
+            Volley::Log.debug "%% #{me}#release: #{odesc} => #{ndesc} (#{tmpdir})"
 
-          system("tar xfz #{local}")
+            packed       = "#{b}-#{v}.tgz"
+            dest         = dir(p, b, v)
 
-          files = Dir["**"]
+            local = pull(op, ob, ov)
+            system("tar xfz #{local}")
 
-          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}")
+            files = Dir["**"]
+            cmd = "tar cfz #{packed} #{files.join(" ")}"
+            #Volley::Log.debug "-- command: #{cmd}"
+            system(cmd)
+
+            push_file(dest, packed, File.open(packed))
+            push_file(dest, "Volleyfile", File.open("Volleyfile")) if File.exists?("Volleyfile")
+            push_file(dest, "from", "#{op}/#{ob}/#{ov}")
+            push_file(dir(p, b), "latest", "#{p}/#{b}/#{v}")
+            push_file(p, "latest_release", "#{p}/#{b}/#{v}")
+          end
         end
 
         true
       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/version.rb

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

data/spec/publisher_spec.rb

@@ -37,14 +37,8 @@ shared_examples_for Volley::Publisher::Base do
   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)
+    expect(@pub.release("spec@trunk:1", "spec@release:v1.0")).to be(true)
+    expect(@pub.versions("spec", "release")).to match_array(%w{v1.0})
   end
 
   it "should be able to tell me the list of projects" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: volley
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
   prerelease: 
 platform: ruby
 authors:
@@ -199,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 974353220657797386
+      hash: -2184208437167885640
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 974353220657797386
+      hash: -2184208437167885640
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24