ploy 0.0.10 → 0.0.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7f85771e973ed6bb9ab1a1c00cfe3eaa09e29a96
4
- data.tar.gz: 3224b8a74b21116d8918722bd7daf7786848afb2
3
+ metadata.gz: 3447f49830b3ade1e0889556f467b39eb20cebd7
4
+ data.tar.gz: c84d5886df90ad0aa690666eabe7c93b8e7a82a6
5
5
  SHA512:
6
- metadata.gz: b470aed37e47d06666d3b8a9c1d231b3a5bbae2f27be2f6fe1ee04615700db82286e961438f062012353c10a250d76cb94a74cd80c8436596cf6ba22e18b7324
7
- data.tar.gz: 3aab04b0801fa14dad40acb2bf66c98f4f9dfd69402a0f8ffc37ce02e440689475a04200f4b7dca7ba8df2c4600bea30e393e36029340d55a458bed74a80a1d9
6
+ metadata.gz: ed7d0c9f17e361f36b13cee0d8d9d024c364b0781ee7f61c5d450d867520dc97855024677b439ea6947ae69bf222dec5e02533dc2db8bb0ef17c6c698724390f
7
+ data.tar.gz: f79207f8be4acf0e9513f2e6f55b0640723033346843668969c242e9b7065a5ce9164ceae192981faab4469361f00b90142ead56b6f55ed2f2fa7890632f2732
@@ -19,6 +19,7 @@ module Ploy
19
19
  :branch => git_branch,
20
20
  :timestamp => git_timestamp,
21
21
  :upstart_files => @conf['upstart_files'],
22
+ :dist_dirs => @conf['dist_dirs'],
22
23
  :dist_dir => @conf['dist_dir'],
23
24
  :prefix => @conf['prefix'],
24
25
  :prep_cmd => @conf['prep_cmd']
@@ -10,6 +10,7 @@ module Ploy
10
10
  attr_accessor :branch
11
11
  attr_accessor :timestamp
12
12
  attr_accessor :upstart_files
13
+ attr_accessor :dist_dirs
13
14
  attr_accessor :dist_dir
14
15
  attr_accessor :prefix
15
16
 
@@ -21,7 +22,12 @@ module Ploy
21
22
  def build_deb
22
23
  info = nil
23
24
  Dir.mktmpdir do |dir|
24
- mirror_dist(dir)
25
+ dist_dirs = Array.new(@dist_dirs || [])
26
+ if @dist_dir
27
+ dist_dirs.unshift({'dir' => @dist_dir, 'prefix' => @prefix})
28
+ end
29
+ mirror_dists(dir, dist_dirs)
30
+ #mirror_dist(dir, @prefix, @dist_dir)
25
31
  write_metadata(dir)
26
32
  Tempfile.open(['postinst', 'sh']) do |file|
27
33
  write_after_install_script(file)
@@ -59,13 +65,19 @@ module Ploy
59
65
  return txt.gsub(/[^A-Za-z0-9\.\+]/, '')
60
66
  end
61
67
 
62
- def mirror_dist(dir)
63
- FileUtils.mkpath mirror_dist_target(dir)
64
- system("rsync -a #{@dist_dir}/* #{mirror_dist_target(dir)}")
68
+ def mirror_dists(topdir, dist_dirs)
69
+ dist_dirs.each do |source|
70
+ mirror_dist(topdir, source['prefix'], source['dir'])
71
+ end
72
+ end
73
+
74
+ def mirror_dist(topdir, prefix, source_dir)
75
+ FileUtils.mkpath mirror_dist_target(topdir, prefix)
76
+ system("rsync -a #{source_dir}/* #{mirror_dist_target(topdir, prefix)}")
65
77
  end
66
78
 
67
- def mirror_dist_target(topdir)
68
- return @prefix ? File.join(topdir, @prefix) : topdir
79
+ def mirror_dist_target(topdir, prefix)
80
+ return prefix ? File.join(topdir, prefix) : topdir
69
81
  end
70
82
 
71
83
  def write_after_install_script(file)
@@ -82,10 +94,9 @@ SCRIPT
82
94
  service = File.basename(upstart)
83
95
  file.write <<SCRIPT
84
96
  if check_upstart_service #{service}; then
85
- restart #{service}
86
- else
87
- start #{service}
97
+ stop #{service}
88
98
  fi
99
+ start #{service}
89
100
  SCRIPT
90
101
  end
91
102
  file.flush
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ploy
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.10
4
+ version: 0.0.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michael Bruce