forj 0.0.16 → 0.0.17

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/bin/forj +13 -1
  2. data/lib/boot.rb +7 -2
  3. metadata +16 -16
data/bin/forj CHANGED
@@ -61,8 +61,20 @@ class Forj < Thor
61
61
  end
62
62
 
63
63
  desc 'boot', 'boot a Maestro box and instruct it to provision the blueprint'
64
+ method_option :build_conf_dir, :aliases => '-c', :desc => 'build config dir to use'
65
+ method_option :branch, :aliases => '-b', :desc => 'branch to use'
64
66
  def boot(blueprint, on, cloud_provider, as, name, test=false)
65
- Boot.boot(blueprint, cloud_provider, name, test)
67
+ build_conf_dir = options[:build_conf_dir]
68
+ branch = options[:branch]
69
+ unless branch
70
+ branch = 'master'
71
+ end
72
+ if options[:build_conf_dir]
73
+ Boot.boot(blueprint, cloud_provider, name, build_conf_dir, branch, test)
74
+ else
75
+ Boot.boot(blueprint, cloud_provider, name, nil, nil, test)
76
+ end
77
+
66
78
  end
67
79
 
68
80
  desc 'down', 'delete the Maestro box and all systems installed by the blueprint'
data/lib/boot.rb CHANGED
@@ -29,7 +29,7 @@ include Repositories
29
29
 
30
30
 
31
31
  module Boot
32
- def boot(blueprint, cloud_provider, name, test=false)
32
+ def boot(blueprint, cloud_provider, name, build_config_dir, branch, test=false)
33
33
  puts 'booting %s on %s' % [blueprint, cloud_provider]
34
34
  # boot maestro
35
35
 
@@ -63,7 +63,12 @@ module Boot
63
63
  build_path = home + '/.hpcloud/maestro/build'
64
64
  Dir.chdir(build_path)
65
65
 
66
- command = './bin/build.sh --box-name maestro --build-config box'
66
+ if build_config_dir != nil
67
+ command = './bin/build.sh --build_ID maestro.10 --box-name maestro --build-conf-dir %s --build-config box --setBranch %s' % [build_config_dir, branch]
68
+ else
69
+ command = './bin/build.sh --build_ID maestro.10 --box-name maestro --build-config box'
70
+ end
71
+
67
72
 
68
73
  Kernel.system(command)
69
74
  Dir.chdir(current_dir)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: forj
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.16
4
+ version: 0.0.17
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,59 +13,59 @@ date: 2014-06-12 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: thor
16
- requirement: &9112200 !ruby/object:Gem::Requirement
16
+ requirement: &21630740 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
- - - ~>
19
+ - - ! '>='
20
20
  - !ruby/object:Gem::Version
21
21
  version: 0.16.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *9112200
24
+ version_requirements: *21630740
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: fog
27
- requirement: &9111660 !ruby/object:Gem::Requirement
27
+ requirement: &21629740 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
- - - ~>
30
+ - - ! '>='
31
31
  - !ruby/object:Gem::Version
32
32
  version: 1.22.1
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *9111660
35
+ version_requirements: *21629740
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: hpcloud
38
- requirement: &9110880 !ruby/object:Gem::Requirement
38
+ requirement: &21627020 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
- - - ~>
41
+ - - ! '>='
42
42
  - !ruby/object:Gem::Version
43
43
  version: 2.0.6
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *9110880
46
+ version_requirements: *21627020
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: git
49
- requirement: &9106980 !ruby/object:Gem::Requirement
49
+ requirement: &21626540 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
- - - ~>
52
+ - - ! '>='
53
53
  - !ruby/object:Gem::Version
54
54
  version: 1.2.7
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *9106980
57
+ version_requirements: *21626540
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rbx-require-relative
60
- requirement: &9106420 !ruby/object:Gem::Requirement
60
+ requirement: &21626060 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
- - - ~>
63
+ - - ! '>='
64
64
  - !ruby/object:Gem::Version
65
65
  version: 0.0.9
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *9106420
68
+ version_requirements: *21626060
69
69
  description: forj command line
70
70
  email:
71
71
  - forj@forj.io