volley 0.1.0.alpha9 → 0.1.0.alpha10

data/Rakefile

@@ -9,6 +9,12 @@ require 'volley'
 desc 'Default: run specs.'
 task :default => :test
 
+task :uninstall do
+  exec "gem uninstall -a -x volley"
+end
+
+### TEST STUFF
+
 desc "Run specs"
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.

data/bin/volley

@@ -33,6 +33,7 @@ Options:
   -d --debug          show debug output, change log level to debug
   -c --config FILE    load additional Volleyfile [default: ~/.Volleyfile]
   -p --primary FILE   load primary Volleyfile [default: ./Volleyfile]
+  -F --force          force operations (redeploy version, republish artifact)
 
   -f --fork           fork process into background and exit
   -l --log LOG        log file [default: /opt/volley/volley.log]
@@ -53,6 +54,8 @@ module Volley
       fork        = options[:fork]
       log         = options[:log]
       level       = options[:level]
+      force       = options[:force]
+      args        = {}
 
       Volley::Dsl::VolleyFile.init
       Volley::Dsl::VolleyFile.load(config, :optional => true)
@@ -79,6 +82,9 @@ module Volley
         plan = "#{project}:#{plan}"
       end
 
+      args = kvs.inject({}) {|h, e| (k, v) = e.split(/=/); h[k.to_sym] = v; h }
+      args[:force] = force
+
       if debug
         Volley::Log.debug "## OPTIONS ##"
         Volley::Log.debug "plan:       #{plan}"
@@ -88,9 +94,9 @@ module Volley
       end
 
       Volley::Log.info "processing '#{plan}' plan for '#{desc}'"
-      Volley.process(:plan => plan, :descriptor => desc, :args => kvs)
+      Volley.process(plan, desc, args)
     rescue => e
-      Volley::Log.error "exception: #{e.message} at #{e.backtrace.first}"
+      Volley::Log.error "error: #{e.message} at #{e.backtrace.first}"
       if debug
         Volley::Log.error e
       else

data/conf/common.volleyfile

@@ -34,16 +34,6 @@ project :volley do
     default do
       (project, branch, version) = args.descriptor.get
 
-      if project.nil? && argv.count
-        first = argv.first
-        (p, b, v) = first.split(/\//) if first
-        if p
-          project = p
-          branch  = b
-          version = v
-        end
-      end
-
       pub  = Volley::Dsl.publisher
       data = []
       if args.all

data/features/step_definitions/publisher_steps.rb

@@ -2,13 +2,13 @@ def publish(desc)
   pwd = Dir.pwd
   Dir.chdir("test/project")
   Volley::Dsl::VolleyFile.load("Volleyfile")
-  Volley.process(:plan => "publish", :descriptor => desc)
+  Volley.process("publish", desc, {})
   Dir.chdir(pwd)
 end
 
 def deploy(desc)
   pwd = Dir.pwd
-  Volley.process(:plan => "deploy", :descriptor => desc)
+  Volley.process("deploy", desc, {})
   Dir.chdir(pwd)
 end
 

data/lib/volley/descriptor.rb

@@ -13,9 +13,7 @@ module Volley
         raise "error parsing descriptor: #{desc}" if (list.count < 2 || list.count > 3) && !@options[:partial]
         (@project, @branch, @version) = list
         @version ||= "latest"
-        #if @version.nil? || @version == "latest"
-        #  @version = Volley.publisher.latest(@project, @branch).split("/").last || nil rescue nil
-        #end
+
         raise "error parsing descriptor: #{desc}" unless (@project && @branch && @version) || @options[:partial]
       end
     end
@@ -29,7 +27,7 @@ module Volley
     end
 
     def to_s
-      "#@project@#@branch#{":#@version" unless @version == "latest"}"
+      "#@project@#@branch:#@version"
     end
   end
 end

data/lib/volley/dsl/plan.rb

@@ -45,6 +45,7 @@ module Volley
       end
 
       def call(options={ })
+        @mode = @name.to_s =~ /deploy/i ? :deploy : :publish
         Volley::Log.debug "## #{@project.name} : #@name"
         @origargs = options[:args]
         data      = @origargs
@@ -59,6 +60,14 @@ module Volley
         [branch, version].join(":")
       end
 
+      def deploying?
+        @mode == :deploy
+      end
+
+      def publishing?
+        @mode == :publish
+      end
+
       def usage
         out = []
         @arguments.each do |n, arg|
@@ -87,7 +96,7 @@ module Volley
       end
 
       def remote(tf)
-        raise "remote can only be set to true or false" unless [true,false].include?(tf)
+        raise "remote can only be set to true or false" unless [true, false].include?(tf)
         @attributes.remote = tf
       end
 
@@ -97,8 +106,18 @@ module Volley
 
       def version
         v = args.descriptor ? args.descriptor.version : nil
-        if v == "latest"
-          v = source.revision || nil
+        if v.nil? || v == "latest"
+          v = begin
+            if deploying?
+              Volley::Dsl.publisher.latest_version(args.descriptor.project, args.descriptor.branch) || v
+            elsif publishing?
+              source.revision || v
+            end
+          rescue => e
+            Volley::Log.debug "failed to get version? #{v.inspect} : #{e.message}"
+            Volley::Log.debug e
+            v
+          end
         end
         v
       end
@@ -197,16 +216,11 @@ module Volley
       private
       def process_arguments(raw)
         Volley::Log.debug ".. process arguments: #{raw.inspect}"
-        if raw
-          kvs   = raw.select { |e| e =~ /\=/ }
-          raw   = raw.reject { |e| e =~ /\=/ }
-          @argv = raw
-          kvs.each do |a|
-            (k, v) = a.split(/\=/)
-            if @arguments[k.to_sym]
-              Volley::Log.debug ".. .. setting argument: #{k} = #{v}"
-              @arguments[k.to_sym].value = v
-            end
+        @argv = raw
+        raw.each do |k, v|
+          if @arguments[k.to_sym]
+            Volley::Log.debug ".. .. setting argument: #{k} = #{v}"
+            @arguments[k.to_sym].value = v
           end
         end
         @arguments.each do |k, v|

data/lib/volley/meta.rb

@@ -3,20 +3,33 @@ module Volley
   class Meta
     def initialize(file="#{Volley.config.directory}/meta.yaml")
       @file = file
-      raise "file does not exist" unless File.file?(@file)
-      @data = YAML.load_file(@file)
+      dir = File.dirname(file)
+      unless File.directory?(dir)
+        Volley::Log.warn "meta file directory does not exist: #{dir}"
+        FileUtils.mkdir_p(dir)
+      end
+      @data = YAML.load_file(@file) || {} rescue {}
     end
 
     def [](project)
-      @data[project.to_sym]
+      @data[:projects] ||= {}
+      @data[:projects][project.to_sym]
     end
 
     def []=(project, version)
-      @data[project.to_sym] = version
+      @data[:projects] ||= {}
+      @data[:projects][project.to_sym] = version
     end
 
     def save
-      File.open(@file, "w") {|f| f.write(@data.to_yaml)}
+      @data[:volley] ||= {}
+      @data[:volley][:version] = Volley::Version::STRING
+      File.open(@file, "w+") {|f| f.write(@data.to_yaml)}
+    end
+
+    def check(project, branch, version)
+      version = Volley::Dsl.publisher.latest_version(project, branch) if version.nil? || version == 'latest'
+      self[project] == "#{branch}:#{version}"
     end
   end
 end

data/lib/volley/publisher/amazons3.rb

@@ -5,6 +5,10 @@ module Volley
     class Amazons3 < Base
       attr_accessor :key, :secret
 
+      def all
+        files[:all]
+      end
+
       def projects
         files[:desc].keys
       rescue => e
@@ -76,10 +80,10 @@ module Volley
 
         contents = f.body
 
+        log "<= #{dir}/#{file}"
         if localdir
           FileUtils.mkdir_p(localdir)
           local = "#{localdir}/#{file}"
-          log "<= #{local}"
           File.open(local, "w") { |lf| lf.write(contents) }
         else
           contents
@@ -115,10 +119,6 @@ module Volley
         #ap hash
         hash
       end
-
-      def all
-        files[:all]
-      end
     end
   end
 end

data/lib/volley/publisher/base.rb

@@ -43,11 +43,15 @@ module Volley
         @latest["#{project}/#{branch}"] ||= pull_file(dir(project,branch), "latest")
       end
 
+      def latest_version(project, branch)
+        latest(project, branch).split("/").last
+      end
+
       def volleyfile(project, branch, version="latest")
         d = dir(project,branch,version)
         contents = pull_file(d, "Volleyfile")
 
-        dest     = "#{@options[:local]}/Volleyfile-#{Time.now.to_i}-#{$$}"
+        dest     = "#@local/Volleyfile-#{Time.now.to_i}-#{$$}"
         raise "File #{dest} already exists" if File.exists?(dest)
 
         log "saving Volleyfile: #{dest}"
@@ -129,7 +133,7 @@ module Volley
       end
 
       def dir(project, branch, version=nil)
-        version = version == 'latest' ? latest(project, branch).split("/").last : version
+        version = version == 'latest' ? latest_version(project, branch) : version
         [project, branch, version].compact.join("/")
       end
 

data/lib/volley/publisher/local.rb

@@ -2,6 +2,10 @@ module Volley
   module Publisher
     class Local < Base
 
+      def all
+        #TODO: make this work like the S3 version
+      end
+
       def projects
         l = Dir["#@directory/*"]
         l.map {|e| e.gsub(/#@directory\//,"")}
@@ -41,7 +45,6 @@ module Volley
 
       def load_configuration
         @directory = requires(:directory)
-        @local     = requires(:local)
         @debug     = optional(:debug, false)
       end
 
@@ -62,9 +65,10 @@ module Volley
       def pull_file(dir, file, localdir=nil)
         remote = "#@directory/#{dir}"
         raise ArtifactMissing, "missing: #{remote}" unless File.exists?("#{remote}/#{file}")
+
+        log "<= #@local/#{dir}/#{file}"
         if localdir
           FileUtils.mkdir_p(localdir)
-          log "<= #@local/#{dir}/#{file}"
           FileUtils.copy("#{remote}/#{file}", "#@local/#{dir}")
         else
           File.read("#{remote}/#{file}")

data/lib/volley.rb

@@ -29,11 +29,8 @@ module Volley
       Volley::Dsl::Project.unload
     end
 
-    def process(opts)
-      plan    = opts[:plan]
-      args    = opts[:args] || []
-      desc    = opts[:descriptor]
-      second  = opts[:second]
+    def process(plan, desc, args)
+      second   = args.delete(:second)
 
       (runpr, plan) = plan.split(/:/) if plan =~ /\:/
       (project, branch, version) = Volley::Descriptor.new(desc).get rescue [nil,nil,nil]
@@ -43,32 +40,40 @@ module Volley
         if Volley::Dsl.project?(runpr)
           # we have the project locally
           pr = Volley::Dsl.project(runpr)
+
           if pr.plan?(plan)
             # plan is defined
-            pl = pr.plan(plan)
-            args << "descriptor=#{desc}"
-            data = pl.call(:args => args)
+
+            if plan == "deploy" && Volley.meta.check(project, branch, version) && !args[:force]
+              raise "project #{project} is already #{branch}:#{version}"
+            end
+
+            args[:descriptor] = desc
+            data = pr.plan(plan).call(:args => args)
 
             if plan == "deploy"
               Volley.meta[project] = data
+              Volley::Log.debug "== #{runpr} = #{data}"
             end
             Volley.meta.save
-            Volley::Log.debug "== #{runpr} = #{data}"
           else
             # plan is not defined
             raise "could not find plan #{plan} in project #{project}"
           end
         else
-          raise "second loop, downloaded volleyfile failed?" if second
           # we dont have the project locally, search the publisher
+          raise "second loop, downloaded volleyfile failed?" if second
+
           pub = Volley::Dsl.publisher
           if pub
             if pub.projects.include?(project) && branch
               vf = pub.volleyfile(project, branch, version)
-              version = pub.latest(project, branch).split("/").last if version.nil? || version == "latest"
+              version = pub.latest_version(project, branch) if version.nil? || version == "latest"
+
               Volley::Log.debug "downloaded volleyfile: #{vf}"
               Volley::Dsl::VolleyFile.load(vf)
-              process(:plan => "#{project}:#{plan}", :descriptor => "#{project}@#{branch}:#{version}", :args => args, :second => true)
+              args[:second] = true
+              process("#{project}:#{plan}", desc.to_s, args)
             else
               raise "project #{project} does not exist in configured publisher #{pub.class}"
             end
@@ -77,8 +82,8 @@ module Volley
           end
         end
       rescue => e
-        Volley::Log.error "error while processing: #{e.message}"
-        Volley::Log.debug e
+        #Volley::Log.error "error while processing: #{e.message}"
+        #Volley::Log.debug e
         raise e
       end
     end

data/spec/descriptor_spec.rb

@@ -18,7 +18,9 @@ describe Volley::Descriptor do
       expect(d).not_to be(nil)
       expect(d.project).to eq(project)
       expect(d.branch).to eq(branch)
-      expect(d.version).to eq(version)
+      if version != "latest"
+        expect(d.version).to eq(version)
+      end
     end
   end
 

data/spec/dsl_plan_spec.rb

@@ -58,33 +58,33 @@ describe Volley::Dsl::Plan do
   it "should handle arguments" do
     @plan.argument(:testarg)
     expect(@plan.arguments.count).to eq(2) # descriptor and testarg
-    @plan.call(:args => ["descriptor=test@trunk/1","testarg=true"])
+    @plan.call(:args => {:descriptor => "test@trunk/1",:testarg => "true"})
     expect(@plan.args.testarg).to eq("true")
   end
 
   it "should handle arguments (with remote false)" do
     @notremote.argument(:testarg)
     expect(@notremote.arguments.count).to eq(2) # descriptor and testarg
-    @notremote.call(:args => ["testarg=true"])
+    @notremote.call(:args => {:testarg => "true"})
     expect(@notremote.args.testarg).to eq("true")
   end
 
   # boolean as strings because we test conversion later
   it "should handle argument defaults" do
     @plan.argument(:testarg, :default => "false")
-    expect {@plan.call(:args => ["descriptor=test@trunk/2"])}.not_to raise_exception
+    expect {@plan.call(:args => {:descriptor => "test@trunk/2"})}.not_to raise_exception
     expect(@plan.args.testarg).to eq("false")
   end
 
   # boolean as strings because we test conversion later
   it "should handle arguments overriding defaults" do
     @plan.argument(:testarg, :default => "false")
-    expect {@plan.call(:args => ["descriptor=test@trunk/3","testarg=true"])}.not_to raise_exception
+    expect {@plan.call(:args => {:descriptor => "test@trunk/3",:testarg => "true"})}.not_to raise_exception
     expect(@plan.args.testarg).to eq("true")
   end
 
   it "should fail if required arguments aren't specified" do
-    expect {@plan.call(:args => [])}.to raise_exception
+    expect {@plan.call(:args => {})}.to raise_exception
   end
 
   [
@@ -96,7 +96,7 @@ describe Volley::Dsl::Plan do
     (type, original, value) = arg
     it "should handle converting argument: #{type}" do
       @plan.argument(type, :convert => type.to_sym)
-      @plan.call(:args => ["descriptor=test@trunk/6","#{type}=#{original}"])
+      @plan.call(:args => {:descriptor => "test@trunk/6",type.to_sym => "#{original}"})
       expect(@plan.args.send(type.to_sym)).to eq(value)
     end
   end

data/spec/publisher_spec.rb

@@ -9,7 +9,7 @@ Volley::Log.console_disable
 shared_examples_for Volley::Publisher::Base do
   before(:all) do
     @remote = "#{root}/test/publisher/remote"
-    @local  = "#{root}/test/publisher/local"
+    @local  = "/opt/volley"
     FileUtils.mkdir_p(@remote)
     FileUtils.mkdir_p(@local)
     [@local, @remote].each { |d| %x{rm -rf #{d}/*} }
@@ -76,7 +76,7 @@ describe Volley::Publisher::Local do
   it_behaves_like Volley::Publisher::Base
 
   before(:each) do
-    @pub = Volley::Publisher::Local.new(:directory => @remote, :local => @local)
+    @pub = Volley::Publisher::Local.new(:directory => @remote)
   end
 end
 
@@ -86,7 +86,6 @@ describe Volley::Publisher::Amazons3 do
   before(:each) do
     @pub = Volley::Publisher::Amazons3.new(:aws_access_key_id     => "AKIAIWUGNGSUZWW5XVCQ",
                                            :aws_secret_access_key => "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",
-                                           :bucket => "inqcloud-volley-test",
-                                           :local => @local)
+                                           :bucket => "inqcloud-volley-test")
   end
 end

data/test/meta.yml

@@ -1,3 +1,4 @@
 
-:spec: trunk:2
-:test: staging:3
+:projects:
+  :spec: trunk:2
+  :test: staging:3

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}.alpha9"
+  gem.version       = "#{Volley::Version::STRING}.alpha10"
 
   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.alpha9
+  version: 0.1.0.alpha10
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp