ploy 0.0.24 → 0.0.25

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODFkNjIwYmIzMWNjZThlMzMxOTM4MWMzNDA3ZTUyZjJkYmQ0MjFlMA==
-  data.tar.gz: !binary |-
-    NWZkMTEzMjFhMTE0NjY2MTk0MWY2Y2MwNmIxZmRhN2E2YTQwYmYwOA==
+SHA1:
+  metadata.gz: 4090e695f11b88462b1730c711e7d1e388341f29
+  data.tar.gz: de3e11bfaf48e1e318205a7a9b075bdafbd98f52
 SHA512:
-  metadata.gz: !binary |-
-    MGFlMjAzYmQwYjQ1Y2UwYWJlM2Q4NjJhMjliZjA2YTFmMzhjYWYyMzU3YWI0
-    OWE2YWZhOTE2YjEwMGJiYjI5MWZmMGEyNmRiODY1MWZiOGYwZDExMDYxNDEw
-    ZDBlMDgwZGY5MmM2Mjk1Yzc4OTE3NWNlYzY2NWFjODNkYTg5MTY=
-  data.tar.gz: !binary |-
-    NWYwODUyY2UzZDBiMjMwNzdlOGY3MmY0NjQyZTYzNThmZTAxYWI3Y2I2NDVj
-    MDZiMmU4YWM3OTJjODdkNDhlMzM3MWY2YWI0NGZjZDkyYWYwODgwZWZlMjVh
-    NWZkNmZlYjdlODNhMDQ1NDQ5MGFiN2M2MzRiNzlmODU4NDJmMzc=
+  metadata.gz: b16a6dc2f796a00b62b67656bff66218527a6c2a733fae65870576613efa047960649875acb685bc84b92e39da179b2f7ee10fd4b4e8589d8ead11671af99f55
+  data.tar.gz: 351fb639d75282aee37f279207bd62c2d826cddad57ae32e27a2e96846ea9606de60c62dc1315af08631104c2040e5bee0c3d1be66f1131b740cb298ca02e511

data/lib/ploy/command/client.rb

@@ -20,9 +20,15 @@ module Ploy
           else
             ips = installable_packages(o[:target_packages], ps.packages)
             ips.each do |package|
-              if package.check_new_version then
-                package.install
-                puts "installed #{package.deploy_name}"
+              if package.installed_version == '' then
+                package.version
+              elsif package.check_new_version then
+                if package.updatevia == 'swf'
+                  puts "skipping update via ploy. updatevia=(%{package.updatevia})"
+                else
+                  package.install
+                  puts "updated #{package.deploy_name}"
+                end
               else
                 puts "no new #{package.deploy_name} available"
               end
@@ -62,7 +68,7 @@ helptext
       def installable_packages(target_packages, packages)
         tph = {}
         target_packages.each { |tp| tph[tp] = true }
-        installables = packages.find_all { |p| tph[p.deploy_name] && p.deployvia == 'ploy-install' }
+        installables = packages.find_all { |p| tph[p.deploy_name] }
       end
 
       private

data/lib/ploy/package.rb

@@ -7,17 +7,17 @@ module Ploy
     attr_accessor :branch
     attr_accessor :version
     attr_accessor :variant
-    attr_accessor :deployvia
+    attr_accessor :updatevia
 
-    def initialize(bucket, deploy, branch, version, variant = nil, deployvia = nil)
+    def initialize(bucket, deploy, branch, version, variant = nil, updatevia = nil)
       @bucket = bucket
       @deploy_name = deploy
       @branch = branch
       @version = version
       @variant = variant
-      @deployvia = 'ploy-install'
-      unless deployvia.nil?
-        @deployvia = deployvia
+      @updatevia = 'ploy'
+      unless updatevia.nil?
+        @updatevia = updatevia
       end
 
       @store = Ploy::S3Storage.new(bucket)
@@ -28,7 +28,11 @@ module Ploy
     end
 
     def installed_version
-      return `dpkg-query -W -f '${gitrev}' #{@deploy_name}`.chomp
+      version = `dpkg-query -W -f '${gitrev}' #{@deploy_name}`.chomp
+      if version =~ /no packages found/i
+        version = ''
+      end
+      return version
     end
 
     def remote_version

data/lib/ploy/packageset.rb

@@ -14,7 +14,7 @@ module Ploy
           v['branch'] || conf['branch'],
           v['version'] || conf['version'],
           v['variant'] || conf['variant'] || nil,
-          v['deployvia'] || conf['deployvia'] || nil
+          v['updatevia'] || conf['updatevia'] || nil
         )
       end
       @locked = conf['locked']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ploy
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Michael Bruce
@@ -14,42 +14,42 @@ dependencies:
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fpm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Multi-phase deployment tool for use in a continuous deployment environment.
@@ -91,17 +91,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Multi-phase deployment tool