volley 0.1.0.alpha4 → 0.1.0.alpha5

data/lib/volley/publisher/local.rb

@@ -3,8 +3,8 @@ module Volley
     class Local < Base
 
       def projects
-        puts "#@directory"
-        Dir["#@directory/*"].map {|e| e.gsub(/#@directory\//,"")}
+        l = Dir["#@directory/*"]
+        l.map {|e| e.gsub(/#@directory\//,"")}
       end
 
       def branches(pr)
@@ -12,7 +12,29 @@ module Volley
       end
 
       def versions(pr, br)
-        Dir["#@directory/#{pr}/#{br}/*"].map {|e| e.gsub(/#@directory\/#{pr}\/#{br}\//,"")}
+        Dir["#@directory/#{pr}/#{br}/*"].map do |e|
+          e.gsub(/#@directory\/#{pr}\/#{br}\//,"")
+        end
+      end
+
+      def exists?(project, branch, version)
+        d = "#@directory/#{project}/#{branch}/#{version}"
+        File.directory?(d)
+      end
+
+      def contents(project, branch, version)
+        d = "#@directory/#{project}/#{branch}/#{version}"
+        Dir["#{d}/*"].map do |e|
+          e.gsub("#{d}/","")
+        end
+      end
+
+      def delete_project(project)
+        FileUtils.rm_rf("#@directory/#{project}")
+        true
+      rescue => e
+        Volley::Log.error "error deleting project: #{e.message} at #{e.backtrace.first}"
+        false
       end
 
       private
@@ -23,37 +45,29 @@ module Volley
         @debug     = optional(:debug, false)
       end
 
-      def remote_file
-        "#@branch-#@version.tgz#{".cpt" if @encrypted}"
-      end
-
-      def push_file(local, path, content = nil)
-        Volley::Log.debug "content=#{content.inspect}"
-        local = File.basename(local) if local =~ /^\//
-        dest = "#@directory/#{path}"
-        file = "#{dest}/#{local}"
-        Volley::Log.info".. -> #{dest}"
-        FileUtils.mkdir_p(File.dirname(file))
+      def push_file(dir, file, content = nil)
+        file = File.basename(file) if file =~ /^\//
+        dest = "#@directory/#{dir}/#{file}"
+        FileUtils.mkdir_p(File.dirname(dest))
         content = content.read if content.is_a?(File)
         if content
-          File.open(file, "w") { |f| f.write(content) }
+          File.open(dest, "w") {|f| f.write(content)}
         else
-          FileUtils.copy(local, file)
+          FileUtils.copy(file, dest)
         end
-        Volley::Log.info".. => #{file}"
+        log "=> #{dest}"
+        dest
       end
 
-      def pull_file(file, path, ldir=nil)
-        remote = "#@directory/#{path}"
-        Volley::Log.info".. <- #{remote}/#{file}"
-        if ldir
-          FileUtils.mkdir_p(ldir)
-        end
-        if ldir
-          Volley::Log.info".. <= #@local/#{path}/#{file}"
-          FileUtils.copy("#{remote}/#{file}", "#@local/#{path}")
+      def pull_file(dir, file, localdir=nil)
+        remote = "#@directory/#{dir}"
+        raise ArtifactMissing, "missing: #{remote}" unless File.exists?("#{remote}/#{file}")
+        if localdir
+          FileUtils.mkdir_p(localdir)
+          log "<= #@local/#{dir}/#{file}"
+          FileUtils.copy("#{remote}/#{file}", "#@local/#{dir}")
         else
-          File.open("#{remote}/#{file}") { |f| f.read }
+          File.read("#{remote}/#{file}")
         end
       end
     end

data/lib/volley/scm/base.rb

@@ -2,7 +2,17 @@
 module Volley
   module Scm
     class Base
+      def initialize(opt={ })
+      end
 
+      def branch
+      end
+
+      def revision
+      end
+
+      def update
+      end
     end
   end
 end

data/lib/volley.rb

@@ -3,34 +3,59 @@ require "ostruct"
 require "active_support/all"
 
 require "volley/version"
-require "volley/config"
 require "volley/log"
-require "volley/volley_file"
 require "volley/publisher/base"
+require "volley/publisher/exceptions"
+require "volley/descriptor"
+require "volley/meta"
 
 require "volley/dsl"
 
 module Volley
   class << self
+    def config
+      @config ||= OpenStruct.new({:directory => "/opt/volley"})
+    end
+
+    def meta
+      @meta ||= Volley::Meta.new
+    end
+
+    def unload
+      Volley::Log.debug "Unload"
+      @config = nil
+      @meta = nil
+      Volley::Dsl::VolleyFile.unload
+      Volley::Dsl::Project.unload
+    end
+
     def process(opts)
-      project = opts[:project]
+      project = nil
       plan    = opts[:plan]
-      branch  = opts[:branch]
-      version = opts[:version]
-      args    = opts[:args]
+      args    = opts[:args] || []
+      desc    = opts[:descriptor]
       second  = opts[:second]
 
+      (project, plan) = plan.split(/:/) if plan =~ /\:/
+      (project, _, _) = Volley::Descriptor.new(desc).get unless project
+
       begin
-        Volley::Log.debug "PROCESS project:#{project} plan:#{plan} branch:#{branch} version:#{version} args:#{args}"
+        Volley::Log.debug "PROCESS plan:#{plan} descriptor:#{desc} args:#{args}"
         if Volley::Dsl.project?(project)
           # we have the project locally
           pr = Volley::Dsl.project(project)
           if pr.plan?(plan)
             # plan is defined
             pl = pr.plan(plan)
-            args << "branch:#{branch}" if branch && args.select{|e| e =~ /^branch\:/}.count == 0
-            args << "version:#{version}" if version && args.select{|e| e =~ /^version\:/}.count == 0
-            pl.call(:rawargs => args)
+            #args << "branch:#{branch}" if branch && args.select{|e| e =~ /^branch\:/}.count == 0
+            #args << "version:#{version}" if version && args.select{|e| e =~ /^version\:/}.count == 0
+            args << "descriptor=#{desc}"
+            data = pl.call(:args => args)
+
+            if plan == "deploy"
+              Volley.meta[project] = data
+            end
+            Volley.meta.save
           else
             # plan is not defined
             raise "could not find plan #{plan} in project #{project}"
@@ -43,7 +68,7 @@ module Volley
             if pub.projects.include?(project)
               vf = pub.volleyfile(opts)
               Volley::Log.debug "downloaded volleyfile: #{vf}"
-              Volley::VolleyFile.load(vf)
+              Volley::Dsl::VolleyFile.load(vf)
               process(:project => project, :plan => plan, :branch => branch, :version => version, :args => args, :second => true)
             else
               raise "project #{project} does not exist in configured publisher #{pub.class}"
@@ -55,10 +80,11 @@ module Volley
       rescue => e
         Volley::Log.error "error while processing: #{e.message}"
         Volley::Log.debug e
+        raise e
       end
 
       #if Volley.config.debug
-      #  ap Volley::Dsl::Project.projects
+      #  ap Volley::Dsl::Project.project
       #end
     end
   end

data/spec/descriptor_spec.rb

@@ -0,0 +1,39 @@
+require 'volley/descriptor'
+
+describe Volley::Descriptor do
+  [
+      %w{spec@trunk:1 spec trunk 1},
+      %w{spec/trunk/1 spec trunk 1},
+      %w{spec-trunk-1 spec trunk 1},
+      %w{spec:trunk:1 spec trunk 1},
+      %w{spec\trunk\1 spec trunk 1},
+      %w{spec@trunk spec trunk latest},
+      %w{spec/trunk spec trunk latest},
+      %w{spec:trunk spec trunk latest},
+      %w{spec\trunk spec trunk latest},
+  ].each do |a|
+    (desc, project, branch, version) = a
+    it "should handle format: '#{desc}'" do
+      d = Volley::Descriptor.new(desc)
+      expect(d).not_to be(nil)
+      expect(d.project).to eq(project)
+      expect(d.branch).to eq(branch)
+      expect(d.version).to eq(version)
+    end
+  end
+
+  %w{
+    spec
+    spec:
+    spec~trunk
+    spec:trunk:1:blarg
+  }.each do |desc|
+    it "should not handle format: '#{desc}'" do
+      expect { Volley::Descriptor.new(desc) }.to raise_error(StandardError)
+    end
+  end
+
+  it "should allow partials when specified" do
+    expect { Volley::Descriptor.new("environment", :partial => true)}.not_to raise_exception
+  end
+end

data/spec/dsl_plan_spec.rb

@@ -0,0 +1,103 @@
+require 'volley'
+
+root = File.expand_path("../../", __FILE__)
+
+describe Volley::Dsl::Plan do
+  before(:each) do
+    Volley.unload
+    @project = Volley::Dsl::Project.project(:spec) do
+      scm :git
+      plan :publish do
+        #nothing
+      end
+      plan :notremote do
+        remote false
+
+      end
+    end
+    @plan = @project.plan(:publish)
+    @notremote = @project.plan(:notremote)
+  end
+
+  it "should be able to define a plan" do
+    expect(@plan).not_to be(nil)
+  end
+
+  it "should be able to define an action" do
+    @plan.action :first do
+      #nothing
+    end
+    expect(@plan.stages.count).to eq(3)
+    expect(@plan.stages[:main].actions.count).to eq(1)
+  end
+
+  it "should be able to define an action in another stage" do
+    @plan.action :second, :post do
+      expect(@plan.stages.count).to eq(3)
+      expect(@plan.stages[:main].actions.count).to eq(1)
+      expect(@plan.stages[:post].actions.count).to eq(1)
+    end
+  end
+
+  it "should be able to access source" do
+    expect {@plan.source.branch}.not_to raise_exception
+  end
+
+  it "should be able to access global config" do
+    Volley.config.blarg = true
+    expect do
+      raise "fail" unless @plan.config.blarg == true
+    end.not_to raise_exception
+  end
+
+  it "should be able to load another Volleyfile" do
+    expect {@plan.load("#{root}/test/dsl/simple.volleyfile")}.not_to raise_exception
+    expect(Volley::Dsl.project(:test)).not_to be(nil)
+  end
+
+  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"])
+    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"])
+    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.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.args.testarg).to eq("true")
+  end
+
+  it "should fail if required arguments aren't specified" do
+    expect {@plan.call(:args => [])}.to raise_exception
+  end
+
+  [
+      ["boolean", "true", true],
+      ["descriptor", "test@trunk/5", Volley::Descriptor.new("test@trunk/5")],
+      ["to_i", "1", 1],
+      ["to_f", "1.12", 1.12],
+  ].each do |arg|
+    (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}"])
+      expect(@plan.args.send(type.to_sym)).to eq(value)
+    end
+  end
+end

data/spec/dsl_project_spec.rb

@@ -0,0 +1,36 @@
+require 'volley'
+
+root = File.expand_path("../../", __FILE__)
+
+describe Volley::Dsl::Project do
+  before(:each) do
+    Volley.unload
+    @project = Volley::Dsl::Project.project(:spec) { }
+  end
+
+  it "should be able to define a project" do
+    expect(@project).not_to be(nil)
+  end
+
+  it "should be able to define a project with an SCM configuration" do
+    expect(@project.scm :git).not_to be(nil)
+  end
+
+  it "should not allow the same project name to used more than once" do
+    expect {Volley::Dsl::Project.project(:spec) { }}.to raise_exception
+  end
+
+  it "should be able to define a project with a plan" do
+    @project.plan(:publish) {}
+    plan = @project.plan(:publish)
+    expect(plan).not_to be(nil)
+    expect(plan.project).to eq(@project)
+  end
+
+  it "should be able to access global config" do
+    Volley.config.blarg = true
+    expect do
+      raise "fail" unless @project.config.blarg == true
+    end.not_to raise_exception
+  end
+end

data/spec/dsl_volleyfile_spec.rb

@@ -0,0 +1,21 @@
+require 'volley'
+
+root = File.expand_path("../../", __FILE__)
+
+describe Volley::Dsl::VolleyFile do
+  it "should be able to load a volleyfile" do
+    Volley::Dsl::VolleyFile.load("#{root}/test/dsl/simple.volleyfile")
+  end
+
+  it "should have a project called test" do
+    expect(Volley::Dsl.project("test")).not_to eq(nil)
+  end
+
+  it "should have a plan called publish" do
+    expect(Volley::Dsl.project("test").plan("publish")).not_to eq(nil)
+  end
+
+  it "should have a plan called deploy" do
+    expect(Volley::Dsl.project("test").plan("deploy")).not_to eq(nil)
+  end
+end

data/spec/meta_spec.rb

@@ -0,0 +1,26 @@
+require 'volley'
+
+root = File.expand_path("../../", __FILE__)
+
+describe Volley::Meta do
+  before(:each) do
+    @meta = Volley::Meta.new("#{root}/test/meta.yml")
+  end
+
+  it "should be instantiated" do
+    expect(@meta).not_to be(nil)
+  end
+
+  it "should be able to get current version for project" do
+    expect(@meta["spec"]).to eq("trunk:2")
+  end
+
+  it "should be able to set new version for project" do
+    @meta["spec"] = "trunk:3"
+    expect(@meta["spec"]).to eq("trunk:3")
+  end
+
+  it "should be able to set version for new project" do
+    expect {@meta["new"] = "blarg:1"}.not_to raise_exception
+  end
+end

data/spec/publisher_spec.rb

@@ -0,0 +1,92 @@
+require 'volley/publisher/local'
+require 'volley/publisher/amazons3'
+
+root = File.expand_path("../../", __FILE__)
+
+Volley::Log.add(:debug, "#{root}/log/volley.log")
+Volley::Log.console_disable
+
+shared_examples_for Volley::Publisher::Base do
+  before(:all) do
+    @remote = "#{root}/test/publisher/remote"
+    @local  = "#{root}/test/publisher/local"
+    FileUtils.mkdir_p(@remote)
+    FileUtils.mkdir_p(@local)
+    [@local, @remote].each { |d| %x{rm -rf #{d}/*} }
+  end
+
+  after(:all) do
+    FileUtils.rm_rf(@remote)
+    FileUtils.rm_rf(@local)
+  end
+
+  it "should be able to publish artifacts" do
+    Dir.chdir("#{root}/test/")
+    expect(@pub.push("spec", "trunk", "1", "./trunk-1.tgz")).to eq(true)
+    expect(@pub.push("spec", "trunk", "2", "./trunk-1.tgz")).to eq(true)
+    expect(@pub.push("spec", "staging", "1", "./trunk-1.tgz")).to eq(true)
+    Dir.chdir(root)
+  end
+
+  it "should be able to retrieve an artifact" do
+    expect(@pub.pull("spec", "trunk", "1")).to eq("#@local/spec/trunk/1/trunk-1.tgz")
+  end
+
+  it "should fail to retrieve a missing artifact" do
+    expect{ @pub.pull("spec", "trunk", "15")}.to raise_error(Volley::Publisher::ArtifactMissing)
+  end
+
+  it "should be able to tell me the list of projects" do
+    expect(@pub.projects).to match_array(%w{spec})
+  end
+
+  it "should be able to tell me the list of branches" do
+    expect(@pub.branches("spec")).to match_array(%w{trunk staging})
+  end
+
+  it "should be able to tell me the list of versions" do
+    expect(@pub.versions("spec", "trunk")).to match_array(%w{1 2 latest})
+  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})
+  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)
+    Dir.chdir(root)
+    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
+    expect(@pub.latest("spec", "trunk")).to eq("spec/trunk/3")
+  end
+
+  it "should throw an exeception when trying to publish a duplicate artifact" do
+    expect { @pub.push("spec", "trunk", "1", "./trunk-1.tgz") }.to raise_error(StandardError)
+  end
+
+  it "should be able to delete a project" do
+    expect(@pub.delete_project("spec")).to eq(true)
+  end
+end
+
+describe Volley::Publisher::Local do
+  it_behaves_like Volley::Publisher::Base
+
+  before(:each) do
+    @pub = Volley::Publisher::Local.new(:directory => @remote, :local => @local)
+  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",
+                                           :aws_secret_access_key => "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",
+                                           :bucket => "inqcloud-volley-test",
+                                           :local => @local)
+  end
+end

data/test/dsl/amazons3_publisher.volleyfile

@@ -0,0 +1,6 @@
+
+publisher :amazons3,
+          :aws_access_key_id     => "AKIAIWUGNGSUZWW5XVCQ",
+          :aws_secret_access_key => "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",
+          :bucket => "inqcloud-volley-test",
+          :local => "#{root}/test/publisher/local"

data/test/dsl/local_publisher.volleyfile

@@ -0,0 +1,4 @@
+
+publisher :local,
+  :directory => "#{Dir.pwd}/test/publisher/remote",
+  :local => "#{Dir.pwd}/test/publisher/local"

data/test/dsl/log_console.volleyfile

@@ -0,0 +1,2 @@
+
+log :debug, STDOUT

data/test/dsl/log_file.volleyfile

@@ -0,0 +1,2 @@
+
+log :debug, "#{Dir.pwd}/test.log"

data/test/dsl/simple.volleyfile

@@ -0,0 +1,17 @@
+project :test do
+  plan :publish do
+    action :build do
+      FileUtils.rm_f("file")
+      File.open("file", "w") {|f| f.write("#{project}/#{branch}/#{version}")}
+    end
+    push do
+      ["file"]
+    end
+  end
+
+  plan :deploy do
+    pull do |dir|
+      File.read("#{dir}/file")
+    end
+  end
+end

data/test/meta.yml

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

data/test/project/Rakefile

@@ -0,0 +1,13 @@
+
+task :build do
+  pwd = Dir.pwd
+  project = "test"
+  %w{trunk staging}.each do |branch|
+    Dir.chdir(branch)
+    Dir["*"].each do |version|
+      cmd = "tar cfz #{pwd}/#{project}-#{branch}-#{version}.tgz *"
+      %x{#{cmd}}
+    end
+    Dir.chdir(pwd)
+  end
+end

data/test/project/Volleyfile

@@ -0,0 +1,18 @@
+project :test do
+  plan :publish do
+    action :build do
+      FileUtils.rm_f("file")
+      ver = "#{project.name}/#{branch}/#{version}"
+      File.open("file", "w") {|f| f.write(ver)}
+    end
+    push do
+      ["file"]
+    end
+  end
+
+  plan :deploy do
+    pull do |dir|
+      File.read("#{dir}/file")
+    end
+  end
+end

data/volley.gemspec

@@ -13,11 +13,12 @@ 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}.alpha4"
+  gem.version       = "#{Volley::Version::STRING}.alpha5"
 
   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"
 end