ploy 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edb371b2fdd1e0a31b8a750f5c72bc35f0e02900
-  data.tar.gz: 30e9eff5f8a814b87e930b4942836156930a8a97
+  metadata.gz: b8fb0758a841e964c496a1313bdcbd3abe5628e7
+  data.tar.gz: 6a076cf94b6d4141065d00e71a637985e678ff0d
 SHA512:
-  metadata.gz: d15796fa9f6bfe217c941006a6f2c79c339dd528662eea33975f3942f87632bd6afa12c847c5fed9f9997cf55db300b0c20e9bd25767db4aad559757f86cbcaf
-  data.tar.gz: 2764731d6ae3cfb308dbeb59e08a4211d24aeb09ad5c15d1a7ca25d054d3bbf488ff611812271c97f923811c72dc5f8afca83cd82edffefcce8b63671b7c71d6
+  metadata.gz: db26435bf5cbfd386bf9331548656c03c10bc78a95c8a2aeb844e3008cc08dd87c0fc2efe645fa2fb0daf1d8c6356a612769e22f53f1682538893d546fbf652b
+  data.tar.gz: 3aa9a163b1c51fbd168fceba0cd126d779246268fd4fa4619576c97285c04e5b967cbd302eda0ae167fea29d52936ef840a302afa2b7edfa6a69c7ee7b1c29ed

data/lib/ploy/command/bless.rb

@@ -16,7 +16,8 @@ module Ploy
         end
 
         pkgs.each do |pkg|
-          pkg.bless
+          blessed = pkg.bless
+          blessed.make_current
           puts "blessed #{o[:deploy]}/#{o[:branch]} at #{o[:version]}"
         end
       end

data/lib/ploy/command/install.rb

@@ -10,9 +10,10 @@ module Ploy
           :version => 'current',
           :branch  => 'master',
           :check   => true,
+          :variant => nil
         }
         optparser(o).parse!(argv)
-        pkg = Ploy::Package.new(o[:bucket], o[:deploy], o[:branch], o[:version])
+        pkg = Ploy::Package.new(o[:bucket], o[:deploy], o[:branch], o[:version], o[:variant])
         if (!o[:check] || pkg.check_new_version)
           pkg.install()
           puts "installed #{o[:deploy]}"
@@ -24,7 +25,7 @@ module Ploy
 
       def help
         return <<helptext
-usage: ploy install -b $bucket -d $deployment -B $branch -v $version
+usage: ploy install -b $bucket -d $deployment -B $branch -v $version [-r $variant]
 
 #{optparser}
 
@@ -59,6 +60,9 @@ helptext
           opts.on("-v", "--version VERSION", "use the given version") do |v|
             o[:version] = v
           end
+          opts.on("-r", "--variant VARIANT", "use the given vaRiant (e.g. 'blessed')") do |v|
+            o[:variant] = v
+          end
         end
         return options
       end

data/lib/ploy/common.rb

@@ -1,14 +1,14 @@
 module Ploy
   module Util
 
-    def Util.remote_name(deploy,branch,rev, blessed = false)
+    def Util.remote_name(deploy,branch,rev, variant = nil)
       r = [
         deploy,
         branch,
         "#{deploy}_#{rev}.deb"
       ]
-      if (blessed) then
-        r.unshift('blessed')
+      if (variant) then
+        r.unshift(variant)
       end
       return r.join('/')
     end

data/lib/ploy/localpackage/debbuilder.rb

@@ -34,7 +34,7 @@ module Ploy
             write_after_install_script(file)
             ol = fpm_optlist(dir)
             ol.add("--after-install", file.path)
-            puts "debug: fpm #{ol.as_string} ."
+            #puts "debug: fpm #{ol.as_string} ."
             info = eval(`fpm #{ol.as_string} .`)
           end
         end

data/lib/ploy/package.rb

@@ -6,11 +6,14 @@ module Ploy
     attr_accessor :deploy_name
     attr_accessor :branch
     attr_accessor :version
+    attr_accessor :variant
 
-    def initialize(bucket, deploy, branch, version)
+    def initialize(bucket, deploy, branch, version, variant = nil)
+      @bucket = bucket
       @deploy_name = deploy
       @branch = branch
       @version = version
+      @variant = variant
 
       @store = Ploy::S3Storage.new(bucket)
     end
@@ -28,18 +31,24 @@ module Ploy
       end
     end
 
+    def blessed
+      return Ploy::Package.new(@bucket, @deploy_name, @branch, @version, "blessed")
+    end
+
     def bless
+      b = self.blessed
       @store.copy(
         location,
-        Ploy::Util.remote_name(@deploy_name, @branch, @version, true)
+        b.location
       )
+      return b
     end
 
     def location
-      return Ploy::Util.remote_name(@deploy_name, @branch, @version)
+      return Ploy::Util.remote_name(@deploy_name, @branch, @version, @variant)
     end
     def location_current
-      return Ploy::Util.remote_name(@deploy_name, @branch, 'current')
+      return Ploy::Util.remote_name(@deploy_name, @branch, 'current', @variant)
     end
 
     def upload(path)
@@ -53,7 +62,7 @@ module Ploy
     def self.from_metadata(bucket, meta)
       out = []
       meta.each do |k,v|
-        out.push(self.new(bucket, v['name'], v['branch'], v['sha']))
+        out.push(self.new(bucket, v['name'], v['branch'], v['sha'], v['variant']))
       end
       return out
     end

data/lib/ploy/packageset.rb

@@ -5,11 +5,15 @@ module Ploy
     def initialize(conf)
       self.packages = []
       conf['packages'].each do |k,v|
+        if (not v)
+          v = {}
+        end
         self.packages.push Ploy::Package.new(
           conf['bucket'] || v['bucket'],
           k,
-          v['branch'],
-          v['version']
+          v['branch'] || conf['branch'],
+          v['version'] || conf['version'],
+          v['variant'] || conf['variant'] || nil
         )
       end
       @locked = conf['locked']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ploy
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Michael Bruce