rake-debian-build 1.0.15 → 1.0.16

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.
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- rake-debian-build (1.0.15)
4
+ rake-debian-build (1.0.16)
5
5
 
6
6
  GEM
7
7
  remote: http://rubygems.org/
@@ -24,7 +24,7 @@ module Debian::Build
24
24
 
25
25
  def self.ubuntu_distributions
26
26
  @@ubuntu_distributions ||=
27
- %w{hardy jaunty karmic lucid}.collect { |distribution| Distribution.new(:ubuntu, distribution) }
27
+ %w{karmic lucid maverick}.collect { |distribution| Distribution.new(:ubuntu, distribution) }
28
28
  end
29
29
 
30
30
  def source_result_directory
@@ -89,9 +89,7 @@ module Debian::Build
89
89
  p[:mirror] = mirror
90
90
 
91
91
  if flavor == :ubuntu
92
- # cdebootstrap fails with ubuntu
93
92
  p[:components] = "'main universe'"
94
- p[:debootstrap] = 'debootstrap'
95
93
  end
96
94
 
97
95
  p.options = options
@@ -9,6 +9,8 @@ module Debian::Build
9
9
  attr_accessor :nickname
10
10
  attr_accessor :incoming, :host
11
11
 
12
+ attr_accessor :login
13
+
12
14
  def initialize
13
15
  self.incoming = '/var/lib/debarchiver/incoming'
14
16
  end
@@ -17,10 +19,10 @@ module Debian::Build
17
19
  raise "No defined host, can't create lock file in ssh" unless host
18
20
 
19
21
  begin
20
- sh "ssh #{host} touch #{lock_file}"
22
+ sh "ssh #{ssh_target} touch #{lock_file}"
21
23
  yield
22
24
  ensure
23
- sh "ssh #{host} rm -f #{lock_file}"
25
+ sh "ssh #{ssh_target} rm -f #{lock_file}"
24
26
  end
25
27
  end
26
28
 
@@ -33,8 +35,12 @@ module Debian::Build
33
35
  sh *["dupload", options, changes_files].flatten.compact
34
36
  end
35
37
 
38
+ def ssh_target
39
+ login ? "#{login}@#{host}" : host
40
+ end
41
+
36
42
  def rsync(target_directory, *files)
37
- sh "rsync -av #{files.join(' ')} #{host}:#{incoming}/#{target_directory}"
43
+ sh "rsync -av #{files.join(' ')} #{ssh_target}:#{incoming}/#{target_directory}"
38
44
  end
39
45
 
40
46
  @@default = Uploader.new
@@ -1,7 +1,7 @@
1
1
  module Rake
2
2
  module Debian
3
3
  module Build
4
- VERSION = "1.0.15"
4
+ VERSION = "1.0.16"
5
5
  end
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rake-debian-build
3
3
  version: !ruby/object:Gem::Version
4
- hash: 9
4
+ hash: 55
5
5
  prerelease: false
6
6
  segments:
7
7
  - 1
8
8
  - 0
9
- - 15
10
- version: 1.0.15
9
+ - 16
10
+ version: 1.0.16
11
11
  platform: ruby
12
12
  authors:
13
13
  - Alban Peignier
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2011-01-21 00:00:00 +01:00
18
+ date: 2011-01-22 00:00:00 +01:00
19
19
  default_executable:
20
20
  dependencies: []
21
21