ploy 0.0.22 → 0.0.23

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDM2ZGI2OWE5OTY0NmE1MWY5Y2EwYzU4NTgxNzJkMDI3ZDFhMjc5Nw==
+    OWFlZjlhYzU5NjBjMGNhYWMzMDA3NmU5YmZhZTYzYmYyMGU3MmM5Yg==
   data.tar.gz: !binary |-
-    OWQ5MWYyODUxNzRjNDlhNTk1NTY3ZGU2MjJiZjhkOWMxZWE5MmJiMw==
+    M2NiNmMxNzE3NzVhZjJhMGE4MTc3OGVmZmY4MmRmYWU0ODFhMDcxNA==
 SHA512:
   metadata.gz: !binary |-
-    ZmM5YjZhODQyYWIwODZjOTc2N2E2YzEwMGZkN2NiODVhOGNmZWVkNTBiNDYw
-    ZmMxMjRmNjcwYTQyMWJmZWMwMWE0MjQxYTk1YWRlOTMzMjZkZTk3MzFhY2Fm
-    YmRhODFiZDU2N2ZjNTAzNmQzYjNmZmI0ZjkyNmY0ZThhNjMwYmE=
+    Mzc0YTQyNzQ4NTJjYzM0MzE4NDZiMDQyNDM3OWNlMGZjYTdiMzViN2JkZmY1
+    ODU2YWU4NjNmMTQwMWYwNjRiZTVlMTRkZWU1NTkyNWIyZjVkMmQwNjE4YjA1
+    NDE5Y2MyZTZlNThkMmExYzg3YzEwZTE2NzE3ZmEzZmNhM2FlOTY=
   data.tar.gz: !binary |-
-    MmFkNzJhNTU1YTVmNzExMmZlOTU3ZTI2YjQzOTM3ZTRlYjBiN2ExZGMxZDE1
-    MjNjZjA5OWY5MGJiMTM4ZTZmOWIwODBjY2JkMTk2MTdmMTc4MTNiYTI5MTkz
-    ZjBmZGExMGJkYTNhMzFmNTQ2YTgwYzBjYTQ1MzU0OTY3ZTZjNjQ=
+    ZDYyYzJkZDI2ZTcyMTA1YTIxYmY0NjJiMjNkZjVkOWFiNGFjNWVjYmExMzIz
+    MmQ1N2U2YWQxYzczZDZlNDg0NDk5MWMzMTNlMTU5NTlmZmMxYjFiNTI0ZDQ3
+    YjMxYTBmZDM4ZDRkZTA0NTMyMzZjYmIwN2ZjMTZkY2QyYThjMGU=

data/lib/ploy/command/bless.rb

@@ -6,7 +6,7 @@ module Ploy
   module Command
     class Bless < Base
       def run(argv)
-        o = {}
+        o = { :variant => "blessed" }
         optparser(o).parse!(argv)
         pkgs = []
         if (o[:datapath]) then
@@ -16,9 +16,9 @@ module Ploy
         end
 
         pkgs.each do |pkg|
-          blessed = pkg.bless
+          blessed = pkg.bless(o[:variant])
           blessed.make_current
-          puts "blessed #{pkg.deploy_name}/#{pkg.branch} at #{pkg.version}"
+          puts "blessed #{pkg.deploy_name}/#{pkg.branch} at #{pkg.version} with variant #{o[:variant]}"
         end
       end
 
@@ -60,6 +60,9 @@ helptext
           opts.on("-f", "--data-file PATH", "load a set of dep/branch/version data from a", "version file compatible with ploy oracle output") do |path|
             o[:datapath] = path
           end
+          opts.on("--variant VARIANT", "bless with a different variant. default is (blessed)") do |variant|
+            o[:variant] = variant
+          end
         end
         return options
       end

data/lib/ploy/command/list.rb

@@ -7,7 +7,7 @@ module Ploy
   module Command
     class List < Base
       def run(argv)
-        o = {:branch => 'master', :all => false, :json => false, :deploy => nil}
+        o = {:branch => 'master', :all => false, :json => false, :deploy => nil, :variant => 'blessed'}
         optparser(o).parse!(argv)
         #puts o.to_yaml
 
@@ -24,7 +24,7 @@ module Ploy
 
         packages.each do |name|
           current = Ploy::Package.new(bucket, name, branch, 'current').remote_version
-          blessed_current = Ploy::Package.new(bucket, name, branch, 'current', 'blessed').remote_version
+          blessed_current = Ploy::Package.new(bucket, name, branch, 'current', o[:variant]).remote_version
 
           if o[:all] || current != blessed_current
             if o[:json]
@@ -72,7 +72,9 @@ helptext
           opts.on("-B", "--branch BRANCH", "use the given branch instead of #{o[:branch]}") do |branch|
             o[:branch] = branch
           end
-
+          opts.on("--variant VARIANT", "bless with a different variant. default is (blessed)") do |variant|
+            o[:variant] = variant
+          end
           opts.on("-a", "--all", "include packages where blessed is current") do |asdf|
             o[:all] = true
           end

data/lib/ploy/package.rb

@@ -42,12 +42,12 @@ module Ploy
       end
     end
 
-    def blessed
-      return Ploy::Package.new(@bucket, @deploy_name, @branch, @version, "blessed")
+    def blessed(variant="blessed")
+      return Ploy::Package.new(@bucket, @deploy_name, @branch, @version, variant)
     end
 
-    def bless
-      b = self.blessed
+    def bless(variant="blessed")
+      b = self.blessed(variant)
       @store.copy(
         location,
         b.location

data/lib/ploy/s3storage.rb

@@ -43,7 +43,7 @@ module Ploy
       package_names = []
       dirs.each do |dir|
         dir.chop!
-        if dir != 'hub' && dir != 'blessed'
+        if dir != 'hub' && dir != 'blessed' && dir != 'staging'
           package_names.push(dir)
         end
       end

metadata

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