forj 0.0.5 → 0.0.6

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.
Files changed (4) hide show
  1. data/bin/forj.rb +2 -15
  2. data/lib/boot.rb +2 -0
  3. metadata +5 -6
  4. data/lib/version.rb +0 -21
data/bin/forj.rb CHANGED
@@ -20,8 +20,6 @@ require_relative '../lib/boot.rb'
20
20
  include Boot
21
21
  require_relative '../lib/down.rb'
22
22
  include Down
23
- require_relative '../lib/version.rb'
24
- include Version
25
23
  require_relative '../lib/setup.rb'
26
24
  include Setup
27
25
 
@@ -43,7 +41,6 @@ class Forj < Thor
43
41
  puts ' -name: name for the maestro box'
44
42
  puts ' down: delete the Maestro box and all systems installed by the blueprint'
45
43
  puts ' setup: set the credentials for forj cli'
46
- puts ' version: display the version of forj cli'
47
44
  puts ''
48
45
  puts ' -credentials:'
49
46
  puts ' hpcloud:'
@@ -57,17 +54,12 @@ class Forj < Thor
57
54
  puts ' openstack_username: your openstack username'
58
55
  puts ' openstack_api_key: your openstack password'
59
56
  puts ' openstack_auth_url: your openstack identity endpoint'
57
+ puts ''
60
58
  end
61
59
 
62
60
  desc 'boot', 'boot a Maestro box and instruct it to provision the blueprint'
63
61
  def boot(blueprint, on, cloud_provider, as, name, test=false)
64
- current_dir = Dir.pwd
65
- home = File.expand_path('~')
66
- Dir.chdir(home)
67
-
68
- Boot.boot(blueprint, cloud_provider,name , test)
69
-
70
- Dir.chdir(current_dir)
62
+ Boot.boot(blueprint, cloud_provider, name, test)
71
63
  end
72
64
 
73
65
  desc 'down', 'delete the Maestro box and all systems installed by the blueprint'
@@ -75,11 +67,6 @@ class Forj < Thor
75
67
  Down.down(name)
76
68
  end
77
69
 
78
- desc 'version', 'get the current version of forj cli'
79
- def version
80
- VERSION.version
81
- end
82
-
83
70
  desc 'setup', 'set the credentials for forj cli'
84
71
  def setup
85
72
  Setup.setup
data/lib/boot.rb CHANGED
@@ -32,6 +32,8 @@ module Boot
32
32
  # boot maestro
33
33
 
34
34
  # get definitions from yaml
35
+ current_dir = Dir.pwd
36
+ Dir.chdir(current_dir)
35
37
  definitions = YamlParse.get_values('../lib/catalog.yaml')
36
38
 
37
39
  # clone the maestro repo
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.5
4
+ version: 0.0.6
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2014-06-12 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: thor
16
- requirement: &18826620 !ruby/object:Gem::Requirement
16
+ requirement: &17417820 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 0.19.1
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *18826620
24
+ version_requirements: *17417820
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: fog
27
- requirement: &18825880 !ruby/object:Gem::Requirement
27
+ requirement: &17416700 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,7 +32,7 @@ dependencies:
32
32
  version: 1.22.1
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *18825880
35
+ version_requirements: *17416700
36
36
  description: forj command line
37
37
  email:
38
38
  - forj@forj.io
@@ -51,7 +51,6 @@ files:
51
51
  - lib/down.rb
52
52
  - lib/boot.rb
53
53
  - lib/setup.rb
54
- - lib/version.rb
55
54
  - lib/repositories.rb
56
55
  homepage: https://forj.io
57
56
  licenses:
data/lib/version.rb DELETED
@@ -1,21 +0,0 @@
1
- #!/usr/bin/env ruby
2
-
3
- # (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
4
- #
5
- # Licensed under the Apache License, Version 2.0 (the "License");
6
- # you may not use this file except in compliance with the License.
7
- # You may obtain a copy of the License at
8
- #
9
- # http://www.apache.org/licenses/LICENSE-2.0
10
- #
11
- # Unless required by applicable law or agreed to in writing, software
12
- # distributed under the License is distributed on an "AS IS" BASIS,
13
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14
- # See the License for the specific language governing permissions and
15
- # limitations under the License.
16
-
17
- module Version
18
- def version
19
- puts 'forj cli v0.1'
20
- end
21
- end