cf 0.6.0.rc1 → 0.6.0.rc2

data/lib/cf/cli.rb

@@ -287,14 +287,6 @@ module CF
       url.gsub(/\/$/, "")
     end
 
-    def target_file
-      one_of(CF::TARGET_FILE, CF::OLD_TARGET_FILE)
-    end
-
-    def tokens_file
-      one_of(CF::TOKENS_FILE, CF::OLD_TOKENS_FILE)
-    end
-
     def one_of(*paths)
       paths.each do |p|
         exp = File.expand_path(p)
@@ -327,13 +319,10 @@ module CF
 
     def targets_info
       new_toks = File.expand_path(CF::TOKENS_FILE)
-      old_toks = File.expand_path(CF::OLD_TOKENS_FILE)
 
       info =
         if File.exist? new_toks
           YAML.load_file(new_toks)
-        elsif File.exist? old_toks
-          MultiJson.load(File.read(old_toks))
         end
 
       info ||= {}
@@ -466,5 +455,15 @@ module CF
         }
       end
     end
+
+    private
+
+    def target_file
+      File.expand_path(CF::TARGET_FILE)
+    end
+
+    def tokens_file
+      File.expand_path(CF::TOKENS_FILE)
+    end
   end
 end

data/lib/cf/constants.rb

@@ -1,7 +1,4 @@
 module CF
-  OLD_TARGET_FILE = "~/.cf_target".freeze
-  OLD_TOKENS_FILE = "~/.cf_token".freeze
-
   CONFIG_DIR = "~/.cf".freeze
 
   LOGS_DIR = "#{CONFIG_DIR}/logs".freeze

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "0.6.0.rc1".freeze
+  VERSION = "0.6.0.rc2".freeze
 end

data/spec/cf/cli_spec.rb

@@ -260,14 +260,6 @@ describe CF::CLI do
       end
     end
 
-    context "when a ~/.cf_target exists" do
-      let(:fake_home_dir) { "#{SPEC_ROOT}/fixtures/fake_home_dirs/old" }
-
-      it "returns the target in that file" do
-        expect(subject).to eq "https://api.some-domain.com"
-      end
-    end
-
     context "when no target file exists" do
       let(:fake_home_dir) { "#{SPEC_ROOT}/fixtures/fake_home_dirs/no_config" }
 
@@ -293,18 +285,6 @@ describe CF::CLI do
       end
     end
 
-    context "when a ~/.cf_token file exists" do
-      let(:fake_home_dir) { "#{SPEC_ROOT}/fixtures/fake_home_dirs/old" }
-
-      it "returns the target in that file" do
-        expect(subject).to eq({
-          "https://api.some-domain.com" => {
-            :token => "bearer some-token"
-          }
-        })
-      end
-    end
-
     context "when no token file exists" do
       let(:fake_home_dir) { "#{SPEC_ROOT}/fixtures/fake_home_dirs/no_config" }
 
@@ -328,16 +308,6 @@ describe CF::CLI do
       end
     end
 
-    context "when a ~/.cf_token file exists" do
-      let(:fake_home_dir) { "#{SPEC_ROOT}/fixtures/fake_home_dirs/old" }
-
-      it "returns the info for the given url" do
-        expect(subject).to eq({
-          :token => "bearer some-token"
-        })
-      end
-    end
-
     context "when no token file exists" do
       let(:fake_home_dir) { "#{SPEC_ROOT}/fixtures/fake_home_dirs/no_config" }
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: cf
 version: !ruby/object:Gem::Version 
-  hash: -1390834006
+  hash: -3773193672
   prerelease: 6
   segments: 
   - 0
   - 6
   - 0
   - rc
-  - 1
-  version: 0.6.0.rc1
+  - 2
+  version: 0.6.0.rc2
 platform: ruby
 authors: 
 - Cloud Foundry Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-18 00:00:00 Z
+date: 2013-03-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -71,14 +71,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1390834006
+        hash: -3773193672
         segments: 
         - 0
         - 6
         - 0
         - rc
-        - 1
-        version: 0.6.0.rc1
+        - 2
+        version: 0.6.0.rc2
     - - <
       - !ruby/object:Gem::Version 
         hash: 5
@@ -134,7 +134,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1390833990
+        hash: -3773193682
         segments: 
         - 0
         - 7
@@ -159,7 +159,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1390833926
+        hash: -3773193618
         segments: 
         - 0
         - 3