ploy 0.0.16 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8fb0758a841e964c496a1313bdcbd3abe5628e7
-  data.tar.gz: 6a076cf94b6d4141065d00e71a637985e678ff0d
+  metadata.gz: 5443dc061a14e20e77deb046b503a8a46a4daf4e
+  data.tar.gz: 4b631bb5b42d08a3bffd6168af9c87a7e98db80e
 SHA512:
-  metadata.gz: db26435bf5cbfd386bf9331548656c03c10bc78a95c8a2aeb844e3008cc08dd87c0fc2efe645fa2fb0daf1d8c6356a612769e22f53f1682538893d546fbf652b
-  data.tar.gz: 3aa9a163b1c51fbd168fceba0cd126d779246268fd4fa4619576c97285c04e5b967cbd302eda0ae167fea29d52936ef840a302afa2b7edfa6a69c7ee7b1c29ed
+  metadata.gz: 752d78863fae459cd586a159407b70ab90cebc056822d3258a2ca5fc759d66940c5c0a89706496bf23d915fdf806a0c2411c4a4e6fde42aa93f48805114f1f52
+  data.tar.gz: eff3d9209e6bd09b13dacbfbedf54def57ed0df30a3caf220d5de1bd8ff11a1a893f827c5e50efd1ef759968a8189787e1648b04279afb92690b74ed1a63f4dc

data/lib/ploy/command/publish.rb

@@ -11,7 +11,7 @@ module Ploy
             puts "ploy publish (#{res.deploy_name} #{res.branch} #{res.version}) ok"
           end
           puts "debug: git rev-parse: #{`git rev-parse HEAD`.chomp}"
-          puts "debug: git symbolic-ref: #{`git symbolic-ref --short -q HEAD`.chomp}"
+          puts "debug: git symbolic-ref: #{`git symbolic-ref -q HEAD |sed -e 's/.*\\///'`.chomp}"
         else
           puts "skipping publish; this is a PR build"
         end

data/lib/ploy/localpackage/config.rb

@@ -39,7 +39,7 @@ module Ploy
 
       private
       def git_branch
-        return ENV['TRAVIS_BRANCH'] || `git symbolic-ref --short -q HEAD`.chomp
+        return ENV['TRAVIS_BRANCH'] || `git symbolic-ref -q HEAD |sed -e 's/.*\\///'`.chomp
       end
 
       def git_revision

data/lib/ploy/package.rb

@@ -19,9 +19,15 @@ module Ploy
     end
 
     def check_new_version
-      installed = `dpkg-query -W -f '${gitrev}' #{@deploy_name}`.chomp
-      remote_v = @store.metadata(location)['git_revision']
-      return (installed != remote_v)
+      return (installed_version != remote_version)
+    end
+
+    def installed_version
+      return `dpkg-query -W -f '${gitrev}' #{@deploy_name}`.chomp
+    end
+
+    def remote_version
+      return @store.metadata(location)['git_revision']
     end
 
     def install

data/lib/ploy/s3storage.rb

@@ -9,7 +9,7 @@ module Ploy
     def put(path, name, meta = {})
       AWS::S3.new.buckets[@bucketname].objects[name].write(
         Pathname.new(path),
-        { :metadata => meta },
+        { :metadata => meta }
       )
     end
 

metadata

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