ploy 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f85771e973ed6bb9ab1a1c00cfe3eaa09e29a96
-  data.tar.gz: 3224b8a74b21116d8918722bd7daf7786848afb2
+  metadata.gz: 3447f49830b3ade1e0889556f467b39eb20cebd7
+  data.tar.gz: c84d5886df90ad0aa690666eabe7c93b8e7a82a6
 SHA512:
-  metadata.gz: b470aed37e47d06666d3b8a9c1d231b3a5bbae2f27be2f6fe1ee04615700db82286e961438f062012353c10a250d76cb94a74cd80c8436596cf6ba22e18b7324
-  data.tar.gz: 3aab04b0801fa14dad40acb2bf66c98f4f9dfd69402a0f8ffc37ce02e440689475a04200f4b7dca7ba8df2c4600bea30e393e36029340d55a458bed74a80a1d9
+  metadata.gz: ed7d0c9f17e361f36b13cee0d8d9d024c364b0781ee7f61c5d450d867520dc97855024677b439ea6947ae69bf222dec5e02533dc2db8bb0ef17c6c698724390f
+  data.tar.gz: f79207f8be4acf0e9513f2e6f55b0640723033346843668969c242e9b7065a5ce9164ceae192981faab4469361f00b90142ead56b6f55ed2f2fa7890632f2732

data/lib/ploy/localpackage/config.rb

@@ -19,6 +19,7 @@ module Ploy
           :branch        => git_branch,
           :timestamp     => git_timestamp,
           :upstart_files => @conf['upstart_files'],
+          :dist_dirs     => @conf['dist_dirs'],
           :dist_dir      => @conf['dist_dir'],
           :prefix        => @conf['prefix'],
           :prep_cmd      => @conf['prep_cmd']

data/lib/ploy/localpackage/debbuilder.rb

@@ -10,6 +10,7 @@ module Ploy
       attr_accessor :branch
       attr_accessor :timestamp
       attr_accessor :upstart_files
+      attr_accessor :dist_dirs
       attr_accessor :dist_dir
       attr_accessor :prefix
 
@@ -21,7 +22,12 @@ module Ploy
       def build_deb
         info = nil
         Dir.mktmpdir do |dir|
-          mirror_dist(dir)
+          dist_dirs = Array.new(@dist_dirs || [])
+          if @dist_dir
+            dist_dirs.unshift({'dir' => @dist_dir, 'prefix' => @prefix})
+          end
+          mirror_dists(dir, dist_dirs)
+          #mirror_dist(dir, @prefix, @dist_dir)
           write_metadata(dir)
           Tempfile.open(['postinst', 'sh']) do |file|
             write_after_install_script(file)
@@ -59,13 +65,19 @@ module Ploy
         return txt.gsub(/[^A-Za-z0-9\.\+]/, '')
       end
 
-      def mirror_dist(dir)
-        FileUtils.mkpath mirror_dist_target(dir)
-        system("rsync -a #{@dist_dir}/* #{mirror_dist_target(dir)}")
+      def mirror_dists(topdir, dist_dirs)
+        dist_dirs.each do |source|
+          mirror_dist(topdir, source['prefix'], source['dir'])
+        end
+      end
+
+      def mirror_dist(topdir, prefix, source_dir)
+        FileUtils.mkpath mirror_dist_target(topdir, prefix)
+        system("rsync -a #{source_dir}/* #{mirror_dist_target(topdir, prefix)}")
       end
 
-      def mirror_dist_target(topdir)
-        return @prefix ? File.join(topdir, @prefix) : topdir
+      def mirror_dist_target(topdir, prefix)
+        return prefix ? File.join(topdir, prefix) : topdir
       end
 
       def write_after_install_script(file)
@@ -82,10 +94,9 @@ SCRIPT
           service = File.basename(upstart)
           file.write <<SCRIPT
           if check_upstart_service #{service}; then
-            restart #{service}
-          else
-            start #{service}
+            stop #{service}
           fi
+          start #{service}
 SCRIPT
         end
         file.flush

metadata

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