ploy 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5443dc061a14e20e77deb046b503a8a46a4daf4e
-  data.tar.gz: 4b631bb5b42d08a3bffd6168af9c87a7e98db80e
+  metadata.gz: 614b0106c907c0c810db0dad6a4a92298bc5f46d
+  data.tar.gz: 45dcfa66c86d65800a9ff23456f2b379a2a17a6c
 SHA512:
-  metadata.gz: 752d78863fae459cd586a159407b70ab90cebc056822d3258a2ca5fc759d66940c5c0a89706496bf23d915fdf806a0c2411c4a4e6fde42aa93f48805114f1f52
-  data.tar.gz: eff3d9209e6bd09b13dacbfbedf54def57ed0df30a3caf220d5de1bd8ff11a1a893f827c5e50efd1ef759968a8189787e1648b04279afb92690b74ed1a63f4dc
+  metadata.gz: a23a1079453065b1cc5e5c6f2e22cfef5b3526a1700a97e6d9e53f5ef73a36c97394ede0f82f1e74d4a06c19a6894bb3edf67763a05230786de2a463c7b2162b
+  data.tar.gz: 4525c8fb9b591fe77fcf395a8d496274e77fb80c719395580dd455ba4fbe954634a8d2405c29201fde9373b20b0c008900fd101496720b7b6eb1d1148d7519bf

data/lib/ploy/command/build.rb

@@ -6,9 +6,10 @@ module Ploy
     class Build < Base
       def run(argv)
         config_source = argv.shift || '.ploy-publisher.yml'
-        config = Ploy::LocalPackage::Config.new config_source
-        path = config.builder.build_deb
-        puts "ploy build deb: #{path}"
+        Ploy::LocalPackage::Config.load(config_source).each do |config|
+          path = config.builder.build_deb
+          puts "ploy build deb: #{path}"
+        end
         return true
       end
 

data/lib/ploy/command/publish.rb

@@ -6,12 +6,14 @@ module Ploy
     class Publish < Base
       def run(argv)
         if not is_pull_request_build then
-          res = Ploy::Publisher.new(argv.shift || '.ploy-publisher.yml').publish
-          if res then
-            puts "ploy publish (#{res.deploy_name} #{res.branch} #{res.version}) ok"
+          published = Ploy::Publisher.new(argv.shift || '.ploy-publisher.yml').publish
+          if published.length > 0 then
+            published.each do |res|
+              puts "ploy publish (#{res.deploy_name} #{res.branch} #{res.version}) ok"
+            end
           end
-          puts "debug: git rev-parse: #{`git rev-parse HEAD`.chomp}"
-          puts "debug: git symbolic-ref: #{`git symbolic-ref -q HEAD |sed -e 's/.*\\///'`.chomp}"
+          #puts "debug: git rev-parse: #{`git rev-parse 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

@@ -3,13 +3,8 @@ require 'ploy/localpackage/debbuilder'
 module Ploy
   module LocalPackage
     class Config
-      def initialize(conf_source = '.ploy-publisher.yml')
-        @conf = conf_source
-        if (/^---/ =~ conf_source) then
-          @conf = YAML::load(conf_source)
-        else
-          @conf = YAML::load_file(conf_source)
-        end
+      def initialize(conf)
+        @conf = conf
       end
 
       def builder
@@ -37,6 +32,24 @@ module Ploy
         )
       end
 
+      def self.load(conf_source = '.ploy-publisher.yml')
+        conf = nil
+        if (/^---/ =~ conf_source) then
+          conf = YAML::load(conf_source)
+        else
+          conf = YAML::load_file(conf_source)
+        end
+        lps = []
+        if conf.key? "packages"
+          conf['packages'].each do |pkg|
+            lps.push(self.new(conf.merge(pkg)))
+          end
+        else
+          lps.push(self.new(conf))
+        end
+        return lps
+      end
+
       private
       def git_branch
         return ENV['TRAVIS_BRANCH'] || `git symbolic-ref -q HEAD |sed -e 's/.*\\///'`.chomp
@@ -50,6 +63,7 @@ module Ploy
         return `git log -1 --pretty=format:"%ct"`
       end
 
+
     end
   end
 end

data/lib/ploy/publisher.rb

@@ -3,15 +3,19 @@ require 'ploy/localpackage/config'
 module Ploy
   class Publisher
     def initialize(conf_source)
-      @config = Ploy::LocalPackage::Config.new conf_source
+      @configs = Ploy::LocalPackage::Config.load(conf_source)
     end
 
     def publish
-      pkgpath = @config.builder.build_deb
-      remote_package = @config.remote_package
-      remote_package.upload(pkgpath)
-      remote_package.make_current
-      return remote_package
+      remotes = []
+      @configs.each do |config|
+        pkgpath = config.builder.build_deb
+        remote_package = config.remote_package
+        remote_package.upload(pkgpath)
+        remote_package.make_current
+        remotes.push(remote_package)
+      end
+      return remotes
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ploy
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Michael Bruce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk