volley 0.1.0.alpha10 → 0.1.0

data/bin/volley

@@ -93,8 +93,12 @@ module Volley
         Volley::Log.debug "key:value:  #{kvs.join(",")}"
       end
 
-      Volley::Log.info "processing '#{plan}' plan for '#{desc}'"
+      #Volley::Log.info "processing '#{plan}' plan for '#{desc}'"
       Volley.process(plan, desc, args)
+    rescue Interrupt
+      Volley::Log.info "interrupted"
+    rescue SystemExit
+      Volley::Log.info "exited"
     rescue => e
       Volley::Log.error "error: #{e.message} at #{e.backtrace.first}"
       if debug

data/conf/common.volleyfile

@@ -65,14 +65,11 @@ project :volley do
       end
     end
   end
-  plan :remote do
+  plan :meta, :remote => false do
     default do
-      pub = Volley::Dsl.publisher
-      (pr, br, vr) = args.descriptor.get
-      vr ||= 'latest'
-      vf = pub.volleyfile(:project => pr, :branch => br, :version => vr)
-      load vf
-      volley :project => "volley", :plan => "list"
+      Volley.meta.projects.each do |k, v|
+        puts "#{k} => #{v}"
+      end
     end
   end
 end

data/lib/volley/dsl/action.rb

@@ -16,15 +16,15 @@ module Volley
       end
 
       def call
-        Volley::Log.debug ".. .. #@name"
+        Volley::Log.debug "## #{project.name}:#{@plan.name}[#{@stage}]##@name"
         self.instance_eval &@block if @block
       end
 
-      delegate :project, :args, :files, :file, :attributes, :log, :arguments, :argv, :branch, :version, :action,
+      delegate :project, :args, :files, :file, :attributes, :log, :arguments, :argv, :branch, :version, :action, :volley,
                :to => :plan
 
       def command(cmd)
-        @plan.shellout(cmd)
+        plan.shellout(cmd)
       end
     end
   end

data/lib/volley/dsl/plan.rb

@@ -4,6 +4,7 @@ module Volley
   module Dsl
     class Plan
       attr_accessor :argv
+      attr_reader :name
       attr_reader :project
       attr_reader :stages
       attr_reader :arguments
@@ -46,15 +47,15 @@ module Volley
 
       def call(options={ })
         @mode = @name.to_s =~ /deploy/i ? :deploy : :publish
-        Volley::Log.debug "## #{@project.name} : #@name"
+        Volley::Log.debug "## #{@project.name}:#@name  (#@mode)"
         @origargs = options[:args]
         data      = @origargs
 
         process_arguments(data)
 
         raise "descriptor must be specified" if @attributes.remote && !args.descriptor
-        #raise "cannot determine branch" unless branch
-        #raise "cannot determine version" unless version
+
+        Volley::Log.info ">> #{@project.name}:#@name"
 
         run_actions
         [branch, version].join(":")
@@ -101,7 +102,9 @@ module Volley
       end
 
       def branch
-        (args.descriptor ? args.descriptor.branch : nil) || source.branch || nil
+        return args.descriptor.branch if args.descriptor
+        return source.branch if publishing?
+        nil
       end
 
       def version
@@ -146,29 +149,12 @@ module Volley
         argument :output, :attr => true, :default => tf, :convert => :boolean
       end
 
-      def default(&block)
-        action(:default, :main, &block)
-      end
-
       def action(name, stage=:main, &block)
         @stages[stage].action(name, :plan => self, :stage => stage, &block)
-        #n = name.to_sym
-        #@actions[stage] << { :name => n, :stage => stage, :block => block }
       end
 
-      def file(file)
-        @files << file
-      end
-
-      def files(*list)
-        list = [*list].flatten
-        if @files.count > 0 && list.count > 0
-          Volley::Log.warn "overriding file list"
-          Volley::Log.debug "files: #{@files.inspect}"
-          Volley::Log.debug "new: #{list.inspect}"
-        end
-        @files = list if list.count > 0
-        @files
+      def default(&block)
+        action(:default, :main, &block)
       end
 
       def push(&block)
@@ -179,22 +165,38 @@ module Volley
         Volley::Dsl::PullAction.new(:pull_dummy, :plan => self, :stage => :main, &block)
       end
 
-      def volley(opts={ })
+      def volley(plan, options={}, &block)
         o = {
-            :project => @project.name,
-            :plan    => "pull",
-        }.merge(opts)
+            :run => plan,
+            :plan => self,
+            :stage => :main,
+            :descriptor => args.descriptor,
+            :args => {},
+        }.merge(options)
+        @stages[:main].add Volley::Dsl::VolleyAction.new("volley-#{plan}", o)
+      end
 
-        action "volley-#{o[:project]}-#{o[:plan]}" do
-          options = { :plan => "#{project}:#{plan}", :descriptor => "#{project}@#{branch}:#{version}", :args => @origargs }.merge(o)
-          Volley.process(options)
-        end
+      def file(file)
+        @files << file
+      end
+
+      def files(*list)
+        list = [*list].flatten
+        list.each {|e| file e} if list.count > 0
+        #if @files.count > 0 && list.count > 0
+        #  Volley::Log.warn "overriding file list"
+        #  Volley::Log.debug "files: #{@files.inspect}"
+        #  Volley::Log.debug "new: #{list.inspect}"
+        #end
+        #@files = list if list.count > 0
+        #@files
+        @files
       end
 
       def command(*args)
         name = args.join(" ").parameterize.to_sym
         action name do
-          shellout(*args)
+          plan.shellout(*args)
         end
       end
 
@@ -215,11 +217,10 @@ module Volley
 
       private
       def process_arguments(raw)
-        Volley::Log.debug ".. process arguments: #{raw.inspect}"
         @argv = raw
         raw.each do |k, v|
           if @arguments[k.to_sym]
-            Volley::Log.debug ".. .. setting argument: #{k} = #{v}"
+            Volley::Log.debug ".. argument: #{k} = #{v}"
             @arguments[k.to_sym].value = v
           end
         end

data/lib/volley/dsl/push_action.rb

@@ -12,10 +12,10 @@ module Volley
         raise "stage instance must be set" unless @stage
         raise "plan instance must be set" unless @plan
 
-        @plan.action :files, :post do
+        @plan.action :files, :main do
           raise "branch(#{branch}) and version(#{version}) must be specified" unless branch && version
 
-          list     = yield
+          list     = yield if block
           list     = [*list].flatten
           # use #exists? so it can work for directories
           notfound = list.reject { |f| File.exists?(f) }
@@ -32,8 +32,8 @@ module Volley
             Dir.mkdir(path)
             dir = Dir.pwd
 
+            Volley::Log.debug ".. files: #{files.inspect}"
             files.each do |art|
-              Volley::Log.debug "art:#{art}"
               next unless art
               if art =~ /^\// && art !~ /^#{dir}/
                 # file is full path and not in current directory
@@ -47,7 +47,6 @@ module Volley
               end
 
               begin
-                Volley::Log.debug "pack file: #{source} => #{dest}"
                 FileUtils.mkdir_p(File.dirname(dest))
                 if File.directory?(source)
                   FileUtils.cp_r(source, dest)

data/lib/volley/dsl/stage.rb

@@ -14,7 +14,6 @@ module Volley
       end
 
       def call
-        Volley::Log.debug ".. #@name"
         @actions.each do |action|
           action.call
         end

data/lib/volley/dsl/volley_action.rb

@@ -0,0 +1,36 @@
+require "volley/dsl/action"
+
+module Volley
+  module Dsl
+    class VolleyAction < Action
+      def initialize(name, options={}, &block)
+        @name = name.to_sym
+        @stage = options.delete(:stage)
+        @plan = options.delete(:plan)
+        @run  = options.delete(:run)
+        @desc = options.delete(:descriptor)
+        @desc ||= @plan.args.descriptor
+        @args = options.delete(:args)
+
+        @options = {
+        }.merge(options)
+
+        raise "stage instance must be set" unless @stage
+        raise "plan instance must be set" unless @plan
+
+        @block = Proc.new do
+          desc = @desc || @plan.args.descriptor
+          plan = @run
+          (runpr, plan) = plan.split(/\:/) if @run =~ /\:/
+          (project, branch, version) = desc.get
+          Volley.process("#{runpr}:#{plan}", "#{runpr}@#{branch}:#{version}", :args => args)
+        end
+
+        #@plan.action "volley-#@run" do
+        #  puts "volley run #@run #@desc"
+        #  Volley.process(@run, @desc.to_s, :args => args)
+        #end
+      end
+    end
+  end
+end

data/lib/volley/meta.rb

@@ -31,5 +31,9 @@ module Volley
       version = Volley::Dsl.publisher.latest_version(project, branch) if version.nil? || version == 'latest'
       self[project] == "#{branch}:#{version}"
     end
+
+    def projects
+      @data[:projects]
+    end
   end
 end

data/lib/volley/publisher/amazons3.rb

@@ -10,28 +10,36 @@ module Volley
       end
 
       def projects
-        files[:desc].keys
+        r = files[:desc].keys || [] rescue []
+        Volley::Log.info "could not find projects" unless r.count > 0
+        r
       rescue => e
         Volley::Log.warn "error getting project list from publisher: #{e.message} at #{e.backtrace.first}"
         []
       end
 
       def branches(pr)
-        files[:desc][pr].keys
+        r = files[:desc][pr].keys || [] rescue []
+        Volley::Log.info "could not find #{pr}" unless r.count > 0
+        r
       rescue => e
         Volley::Log.warn "error getting branch list from publisher: #{e.message}"
         []
       end
 
       def versions(pr, br)
-        files[:desc][pr][br].keys
+        r = files[:desc][pr][br].keys || [] rescue []
+        Volley::Log.info "could not find #{pr}@#{br}" unless r.count > 0
+        r
       rescue => e
         Volley::Log.warn "error getting version list from publisher: #{e.message}"
         []
       end
 
       def contents(pr, br, vr)
-        files[:desc][pr][br][vr].map {|e| e.gsub("#{pr}/#{br}/#{vr}/","")}
+        r = files[:desc][pr][br][vr].map {|e| e.gsub("#{pr}/#{br}/#{vr}/","")} || [] rescue []
+        Volley::Log.info "could not find #{pr}@#{br}:#{vr}" unless r.count > 0
+        r
       rescue => e
         Volley::Log.warn "error getting contents list from publisher: #{e.message}"
         []
@@ -44,7 +52,7 @@ module Volley
       def delete_project(project)
         Volley::Log.info "delete_project #{project}"
         dir = @connection.directories.get(@bucket)
-        dir.files.select{|e| e.key =~ /^#{project}\//}.each do |f|
+        dir.files.select { |e| e.key =~ /^#{project}\// }.each do |f|
           Volley::Log.info "- #{f.key}"
           f.destroy
         end
@@ -58,9 +66,9 @@ module Volley
       protected
 
       def load_configuration
-        @key       = requires(:aws_access_key_id)
-        @secret    = requires(:aws_secret_access_key)
-        @bucket    = requires(:bucket)
+        @key    = requires(:aws_access_key_id)
+        @secret = requires(:aws_secret_access_key)
+        @bucket = requires(:bucket)
         connect
       end
 
@@ -68,14 +76,14 @@ module Volley
         file = File.basename(file)
         dest = "#{dir}/#{file}"
         #log "-> #@bucket/#{path}"
-        f = root.files.create(:key => dest, :body => contents, :public => true)
+        f    = root.files.create(:key => dest, :body => contents, :public => true)
         log "=> #{f.public_url.gsub("%2F", "/")}"
         dest
       end
 
       def pull_file(dir, file, localdir=nil)
         remote = "#{dir}/#{file}"
-        f = root.files.get(remote)
+        f      = root.files.get(remote)
         raise ArtifactMissing, "missing: #{remote}" unless f
 
         contents = f.body
@@ -103,16 +111,16 @@ module Volley
       end
 
       def files
-        hash = {:desc => {}, :all => {}, :latest => {}}
-        @connection.directories.get(@bucket).files.collect{|e| e.key}.each do |e|
-          (pr, br, vr) = e.split(/\//)
-          hash[:desc][pr] ||= {}
-          hash[:desc][pr][br] ||= {}
+        hash = { :desc => { }, :all => { }, :latest => { } }
+        @connection.directories.get(@bucket).files.collect { |e| e.key }.each do |e|
+          (pr, br, vr)            = e.split(/\//)
+          hash[:desc][pr]         ||= { }
+          hash[:desc][pr][br]     ||= { }
           hash[:desc][pr][br][vr] ||= []
           hash[:desc][pr][br][vr] << e
-          hash[:all] ||= {}
-          hash[:latest] ||= {}
-          v = "#{pr}/#{br}/#{vr}"
+          hash[:all]    ||= { }
+          hash[:latest] ||= { }
+          v             = "#{pr}/#{br}/#{vr}"
           #hash[:latest]["#{pr}/#{br}"] ||= latest(pr, br)
           hash[:all][v] = hash["latest"] == v
         end

data/lib/volley/version.rb

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

data/lib/volley.rb

@@ -45,7 +45,8 @@ module Volley
             # plan is defined
 
             if plan == "deploy" && Volley.meta.check(project, branch, version) && !args[:force]
-              raise "project #{project} is already #{branch}:#{version}"
+              Volley::Log.info "project #{project} is already #{branch}:#{version}"
+              return
             end
 
             args[:descriptor] = desc
@@ -73,7 +74,7 @@ module Volley
               Volley::Log.debug "downloaded volleyfile: #{vf}"
               Volley::Dsl::VolleyFile.load(vf)
               args[:second] = true
-              process("#{project}:#{plan}", desc.to_s, args)
+              process("#{project}:#{plan}", "#{project}@#{branch}:#{version}", args)
             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}.alpha10"
+  gem.version       = "#{Volley::Version::STRING}"
 
   gem.add_dependency "clamp"
   gem.add_dependency "fog"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: volley
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha10
-  prerelease: 6
+  version: 0.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Shawn Catanzarite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -140,6 +140,7 @@ files:
 - lib/volley/dsl/pull_action.rb
 - lib/volley/dsl/push_action.rb
 - lib/volley/dsl/stage.rb
+- lib/volley/dsl/volley_action.rb
 - lib/volley/log.rb
 - lib/volley/meta.rb
 - lib/volley/publisher/amazons3.rb
@@ -181,9 +182,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21