volley 0.1.21 → 0.1.23

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p286@volley

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v0.1.22:
+* add support for deleting branches and versions
+* ruby version file
+
+## v0.1.21:
+* use common regex for descriptor checks and processing
+
 ## v0.1.20:
 * better support for publisher#release and volley:released plan. should now be able to see which version a release is from
 

data/conf/common.volleyfile

@@ -15,7 +15,7 @@ project :volley do
       Volley::Log.info "SCM:"
       Volley::Log.info ".. branch: #{source.branch} revision: #{source.revision}" if source
       Volley::Log.info "Projects/Plans:"
-      Volley::Dsl::Project.projects.reject { |k, _| k==:volley }.each do |p, project|
+      Volley::Dsl::Project.projects.reject { |k, _| [:volley, :release, :project, :branch, :version].include?(k) }.each do |p, project|
         h = project.plans
         next unless h.count > 0
         h.keys.each do |pl|
@@ -28,10 +28,10 @@ project :volley do
   plan :list, :remote => false do
     default do
       Volley::Dsl::Project.projects.each do |p, project|
-        Volley::Log.info "project: #{p}"
         project.plans.each do |pl, plan|
-          Volley::Log.info ".. #{pl} #{plan.usage}"
+          Volley::Log.info "#{p}:#{pl} #{plan.usage}"
         end
+        Volley::Log.info ""
       end
     end
   end
@@ -69,7 +69,7 @@ project :volley do
     default do
       (project, branch, version) = args.descriptor.get
 
-      pub  = Volley::Dsl.publisher
+      pub = Volley::Dsl.publisher
       data = []
       if args.all
         data = pub.all.keys.reject { |e| e =~ /latest$/ }
@@ -162,7 +162,127 @@ project :volley do
   plan :exists, :remote => false do
     default do
       (project, branch, version) = args.descriptor.get
-      pub                        = Volley::Dsl.publisher
+      pub = Volley::Dsl.publisher
+      if project && branch && version != "latest"
+        if pub.exists?(project, branch, version)
+          Volley::Log.warn "#{args.descriptor} exists"
+        else
+          Volley::Log.warn "#{args.descriptor} does not exist"
+          raise "#{args.descriptor} does not exist"
+        end
+      else
+        Volley::Log.error "must specify full descriptor"
+        stop
+      end
+    end
+  end
+end
+
+project :release do
+  plan :create do
+    argument :version, required: true
+
+    default do
+      pub = Volley::Dsl.publisher
+      desc = args.descriptor
+      to = args.version
+      old = desc.to_s
+      new = "#{desc.project}@release:#{to}"
+      pub.release(old, new)
+    end
+  end
+
+  plan :list, remote: false do
+    argument :project, required: true
+    default 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
+  end
+end
+
+project :project do
+  plan :list, remote: false do
+    default do
+      pub = Volley::Dsl.publisher
+      pub.projects.each do |p|
+        Volley::Log.warn p
+      end
+    end
+  end
+  plan :remove, remote: false do
+    argument :name, required: true
+    #argument :force, default: false, convert: :boolean
+    default do
+      pub = Volley::Dsl.publisher
+      if args.force
+        Volley::Log.debug "removing project: #{args.name}"
+        pub.delete_project(args.name)
+      else
+        Volley::Log.warn "this process cannot be undone, if you are sure, run the same command with -F"
+      end
+    end
+  end
+end
+
+project :branch do
+  plan :list, remote: false do
+    argument :project, required: true
+    default do
+      Volley::Dsl.publisher.branches(args.project).each do |b|
+        Volley::Log.warn "#{args.project}@#{b}"
+      end
+    end
+  end
+  plan :remove do
+    default do
+      pub = Volley::Dsl.publisher
+      p = args.descriptor.project
+      b = args.descriptor.branch
+      if args.force
+        Volley::Log.debug "removing branch: #{p}@#{b}"
+        pub.delete_branch(p, b)
+      else
+        Volley::Log.warn "this process cannot be undone, if you are sure, run the same command with -F"
+      end
+    end
+  end
+end
+
+project :version do
+  plan :list do
+    default do
+      p = args.descriptor.project
+      b = args.descriptor.branch
+      Volley::Dsl.publisher.versions(p, b).each do |v|
+        Volley::Log.warn "#{p}@#{b}:#{v}"
+      end
+    end
+  end
+  plan :remove do
+    default do
+      pub = Volley::Dsl.publisher
+      (p, b, v) = args.descriptor.get
+      if args.force
+        Volley::Log.debug "removing version: #{p}@#{b}:#{v}"
+        pub.delete_version(p, b, v)
+      else
+        Volley::Log.warn "this process cannot be undone, if you are sure, run the same command with -F"
+      end
+    end
+  end
+  plan :exists do
+    default do
+      (project, branch, version) = args.descriptor.get
+      pub = Volley::Dsl.publisher
       if project && branch && version != "latest"
         if pub.exists?(project, branch, version)
           Volley::Log.warn "#{args.descriptor} exists"
@@ -176,4 +296,4 @@ project :volley do
       end
     end
   end
-end
+end

data/lib/volley/dsl/argument.rb

@@ -75,10 +75,17 @@ module Volley
       #end
 
       def usage
+        return if (@name == :descriptor && !@required) || @name == :force
+        n = @name
         v = @choices || @convert || "string"
-        r = @required ? "*" : ""
-        d = @default ? "(#@default)" : ""
-        "#@name:#{v}#{r}#{d}"
+        d = @default ? " (#@default)" : ""
+        n = "#{n}=#{v}#{d}"
+        if required
+          n = "<#{n}>"
+        else
+          n = "[#{n}]"
+        end
+        n
       end
 
       def boolean(value)
@@ -93,4 +100,4 @@ module Volley
       end
     end
   end
-end
+end

data/lib/volley/dsl/plan.rb

@@ -141,7 +141,7 @@ module Volley
             end
           rescue => e
             Volley::Log.debug "failed to get version? #{v.inspect} : #{e.message}"
-            Volley::Log.debug e
+            #Volley::Log.debug e
             v
           end
         end
@@ -261,4 +261,4 @@ module Volley
       end
     end
   end
-end
+end

data/lib/volley/publisher/amazons3.rb

@@ -76,10 +76,29 @@ module Volley
       end
 
       def delete_project(project)
-        Volley::Log.info "delete_project #{project}"
+        Volley::Log.debug "delete_project #{project}"
+        delete_files("#{project}/")
+      end
+
+      def delete_branch(project, branch)
+        Volley::Log.debug "delete_branch #{project} #{branch}"
+        delete_files("#{project}/#{branch}/")
+      end
+
+      def delete_version(project, branch, version)
+        Volley::Log.debug "delete_version #{project} #{branch} #{version}"
+        delete_files("#{project}/#{branch}/#{version}/")
+      end
+
+      protected
+
+      def delete_files(pattern)
+        Volley::Log.debug "delete_files #{pattern}"
         dir = @connection.directories.get(@bucket)
-        dir.files.select { |e| e.key =~ /^#{project}\// }.each do |f|
-          Volley::Log.info "- #{f.key}"
+        list = []
+        dir.files.each {|e| list << e if e.key =~ /^#{pattern}/}
+        list.each do |f|
+          Volley::Log.debug "- #{f.key}"
           f.destroy
         end
         true
@@ -89,8 +108,6 @@ module Volley
         false
       end
 
-      protected
-
       def load_configuration
         @key    = requires(:aws_access_key_id)
         @secret = requires(:aws_secret_access_key)
@@ -156,4 +173,4 @@ module Volley
       end
     end
   end
-end
+end

data/lib/volley/publisher/local.rb

@@ -48,15 +48,27 @@ module Volley
       end
 
       def delete_project(project)
-        FileUtils.rm_rf("#@directory/#{project}")
+        delete_files("#{project}")
+      end
+
+      def delete_branch(project, branch)
+        delete_files("#{project}/#{branch}")
+      end
+
+      def delete_version(project, branch, version)
+        delete_files("#{project}/#{branch}/#{version}")
+      end
+
+      private
+
+      def delete_files(path)
+        FileUtils.rm_rf("#@directory/#{path}")
         true
       rescue => e
         Volley::Log.error "error deleting project: #{e.message} at #{e.backtrace.first}"
         false
       end
 
-      private
-
       def load_configuration
         @directory = requires(:directory)
         @debug     = optional(:debug, false)
@@ -90,4 +102,4 @@ module Volley
       end
     end
   end
-end
+end

data/lib/volley/version.rb

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

data/spec/publisher_spec.rb

@@ -8,15 +8,12 @@ Volley::Log.console_disable
 
 shared_examples_for Volley::Publisher::Base do
   before(:all) do
-    @remote = "#{root}/test/publisher/remote"
-    @local  = "/opt/volley"
-    FileUtils.mkdir_p(@remote)
+    @local = "/opt/volley"
     FileUtils.mkdir_p(@local)
-    [@local, @remote].each { |d| %x{rm -rf #{d}/*} }
+    %x{rm -rf #@local/*}
   end
 
   after(:all) do
-    FileUtils.rm_rf(@remote)
     FileUtils.rm_rf(@local)
   end
 
@@ -74,13 +71,21 @@ 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
     Dir.chdir(root)
   end
 
+  it "should be able to delete a version" do
+    expect(@pub.delete_version("spec", "trunk", "1")).to eq(true)
+  end
+
+  it "should be able to delete a branch" do
+    expect(@pub.delete_branch("spec", "trunk")).to eq(true)
+  end
+
   it "should be able to delete a project" do
     expect(@pub.delete_project("spec")).to eq(true)
   end
@@ -89,17 +94,27 @@ end
 describe Volley::Publisher::Local do
   it_behaves_like Volley::Publisher::Base
 
+  before(:all) do
+    @remote = "#{root}/test/publisher/remote"
+    FileUtils.mkdir_p(@remote)
+    %x{rm -rf #@remote/*}
+  end
+
   before(:each) do
     @pub = Volley::Publisher::Local.new(:directory => @remote)
   end
+
+  after(:all) do
+    FileUtils.rm_rf(@remote)
+  end
 end
 
 describe Volley::Publisher::Amazons3 do
   it_behaves_like Volley::Publisher::Base
 
   before(:each) do
-    @pub = Volley::Publisher::Amazons3.new(:aws_access_key_id     => "AKIAIWUGNGSUZWW5XVCQ",
+    @pub = Volley::Publisher::Amazons3.new(:aws_access_key_id => "AKIAIWUGNGSUZWW5XVCQ",
                                            :aws_secret_access_key => "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",
                                            :bucket => "inqcloud-volley-test")
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: volley
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -133,6 +133,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .ruby-version
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -199,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2209489174852755348
+      hash: 2007725385198134767
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -208,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2209489174852755348
+      hash: 2007725385198134767
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24