capistrano-scm-bamboo 1.1.0 → 1.2.0

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.
@@ -9,7 +9,7 @@ module Capistrano
9
9
 
10
10
  class Bamboo < Base
11
11
  def head
12
- "#{variable(:plan_key)}-#{variable(:build_number)}"
12
+ "#{plan_key}-#{variable(:build_number)}"
13
13
  end
14
14
 
15
15
  def query_revision(revision)
@@ -20,14 +20,24 @@ module Capistrano
20
20
 
21
21
  def checkout(revision, destination)
22
22
  # TODO: graceful error handling
23
- response = Typhoeus::Request.get("#{repository}/result/#{variable(:plan_key)}/#{variable(:build_number)}.json?expand=artifacts", :username => variable(:scm_username), :password => variable(:scm_passphrase))
23
+ response = Typhoeus::Request.get("#{repository}/result/#{plan_key}/#{variable(:build_number)}.json?expand=artifacts", :username => variable(:scm_username), :password => variable(:scm_passphrase))
24
24
  result = JSON.parse(response.body)
25
25
  artifact = result["artifacts"]["artifact"].select { |artifact| artifact["name"] == variable(:artifact) }
26
26
  artifactUrl = artifact[0]["link"]["href"]
27
27
 
28
28
  build_actual = result["number"]
29
29
 
30
- %Q{TMPDIR=`mktemp -d` && cd $TMPDIR && wget -m -nH -q #{artifactUrl} && mv artifact/#{variable(:plan_key)}/shared/build-#{build_actual}/#{variable(:artifact)}/ "#{destination}" && rm -rf "$TMPDIR"}
30
+ %Q{TMPDIR=`mktemp -d` && cd $TMPDIR && wget -m -nH -q #{artifactUrl} && mv artifact/#{plan_key}/shared/build-#{build_actual}/#{variable(:artifact)}/ "#{destination}" && rm -rf "$TMPDIR"}
31
+ end
32
+
33
+ def plan_key
34
+ if (variable(:plan_key))
35
+ variable(:plan_key)
36
+ elsif (variable(:build_key))
37
+ plan_key = variable(:build_key)
38
+ plan_key.slice(0...plan_key('-'))
39
+ else
40
+
31
41
  end
32
42
 
33
43
  alias_method :export, :checkout
@@ -1,7 +1,7 @@
1
1
  module Capistrano
2
2
  module Scm
3
3
  module Bamboo
4
- VERSION = "1.1.0"
4
+ VERSION = "1.2.0"
5
5
  end
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: capistrano-scm-bamboo
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 1.2.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-04-17 00:00:00.000000000 Z
12
+ date: 2012-06-10 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: capistrano
16
- requirement: &70260535479740 !ruby/object:Gem::Requirement
16
+ requirement: &70231993755180 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70260535479740
24
+ version_requirements: *70231993755180
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: json
27
- requirement: &70260535479220 !ruby/object:Gem::Requirement
27
+ requirement: &70231993754480 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70260535479220
35
+ version_requirements: *70231993754480
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: typhoeus
38
- requirement: &70260535495000 !ruby/object:Gem::Requirement
38
+ requirement: &70232001567120 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70260535495000
46
+ version_requirements: *70232001567120
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rspec
49
- requirement: &70260535494340 !ruby/object:Gem::Requirement
49
+ requirement: &70232001561500 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70260535494340
57
+ version_requirements: *70232001561500
58
58
  description: ! "\nWith this plugin, you can use Bamboo build artifacts as a repository,
59
59
  and\ndeploy your build artifact with Capistrano.\n "
60
60
  email: