cf 0.1.3 → 0.1.4

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 (3) hide show
  1. data/lib/cf/cli/command.rb +11 -4
  2. data/lib/cf/version.rb +1 -1
  3. metadata +28 -12
data/lib/cf/cli/command.rb CHANGED
@@ -327,14 +327,12 @@ module CF
327
327
  end
328
328
 
329
329
  def one_of(*paths)
330
- first = nil
331
330
  paths.each do |p|
332
331
  exp = File.expand_path(p)
333
- first ||= exp
334
332
  return exp if File.exist? exp
335
333
  end
336
334
 
337
- first
335
+ paths.first
338
336
  end
339
337
 
340
338
  def client_target
@@ -357,7 +355,16 @@ module CF
357
355
  end
358
356
 
359
357
  def tokens
360
- YAML.load_file(tokens_file)
358
+ new_toks = File.expand_path(CF::TOKENS_FILE)
359
+ old_toks = File.expand_path(CF::OLD_TOKENS_FILE)
360
+
361
+ if File.exist? new_toks
362
+ YAML.load_file(new_toks)
363
+ elsif File.exist? old_toks
364
+ JSON.load(File.read(old_toks))
365
+ else
366
+ {}
367
+ end
361
368
  end
362
369
 
363
370
  def client_token
data/lib/cf/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module CF
2
- VERSION = "0.1.3"
2
+ VERSION = "0.1.4"
3
3
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cf
3
3
  version: !ruby/object:Gem::Version
4
- hash: 29
4
+ hash: 19
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 1
9
- - 3
10
- version: 0.1.3
9
+ - 4
10
+ version: 0.1.4
11
11
  platform: ruby
12
12
  authors:
13
13
  - Alex Suraci
@@ -15,12 +15,28 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-05-01 00:00:00 Z
18
+ date: 2012-05-02 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
- name: interact
21
+ name: json_pure
22
22
  prerelease: false
23
23
  requirement: &id001 !ruby/object:Gem::Requirement
24
+ none: false
25
+ requirements:
26
+ - - ~>
27
+ - !ruby/object:Gem::Version
28
+ hash: 5
29
+ segments:
30
+ - 1
31
+ - 6
32
+ - 5
33
+ version: 1.6.5
34
+ type: :runtime
35
+ version_requirements: *id001
36
+ - !ruby/object:Gem::Dependency
37
+ name: interact
38
+ prerelease: false
39
+ requirement: &id002 !ruby/object:Gem::Requirement
24
40
  none: false
25
41
  requirements:
26
42
  - - ~>
@@ -32,11 +48,11 @@ dependencies:
32
48
  - 1
33
49
  version: 0.4.1
34
50
  type: :runtime
35
- version_requirements: *id001
51
+ version_requirements: *id002
36
52
  - !ruby/object:Gem::Dependency
37
53
  name: cfoundry
38
54
  prerelease: false
39
- requirement: &id002 !ruby/object:Gem::Requirement
55
+ requirement: &id003 !ruby/object:Gem::Requirement
40
56
  none: false
41
57
  requirements:
42
58
  - - ~>
@@ -48,11 +64,11 @@ dependencies:
48
64
  - 0
49
65
  version: 0.1.0
50
66
  type: :runtime
51
- version_requirements: *id002
67
+ version_requirements: *id003
52
68
  - !ruby/object:Gem::Dependency
53
69
  name: thor
54
70
  prerelease: false
55
- requirement: &id003 !ruby/object:Gem::Requirement
71
+ requirement: &id004 !ruby/object:Gem::Requirement
56
72
  none: false
57
73
  requirements:
58
74
  - - ~>
@@ -64,11 +80,11 @@ dependencies:
64
80
  - 6
65
81
  version: 0.14.6
66
82
  type: :runtime
67
- version_requirements: *id003
83
+ version_requirements: *id004
68
84
  - !ruby/object:Gem::Dependency
69
85
  name: manifests-vmc-plugin
70
86
  prerelease: false
71
- requirement: &id004 !ruby/object:Gem::Requirement
87
+ requirement: &id005 !ruby/object:Gem::Requirement
72
88
  none: false
73
89
  requirements:
74
90
  - - ~>
@@ -80,7 +96,7 @@ dependencies:
80
96
  - 0
81
97
  version: 0.1.0
82
98
  type: :runtime
83
- version_requirements: *id004
99
+ version_requirements: *id005
84
100
  description:
85
101
  email:
86
102
  - asuraci@vmware.com