cf 5.2.1.rc8 → 5.2.1.rc9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YThiM2I0YjhiZjFkYWFmNmZhYWU2ZmU2MDUzODYyZGU0OThhNDhkMw==
+    OTJjODEwNDUzYmM5NzU1ZmM0OWZhODFlNzgyY2UwMmMwMDU5NzZjNQ==
   data.tar.gz: !binary |-
-    MTdhZGNhNDA2YTBmMTBhMzBkNzBjZmJiY2IwYjVhMjI5NzJkOGZlYg==
+    OGYwYWQzZjA1NDBmZGZlZDdjZDdjMGQyOGJkZWMwZmVhYTkwMjljZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGY3N2JkY2U5YWVmMzc5NDRhZjY5YTQ4YWU2YTI5YWI5MjQ3YzM3Y2Q0ZTY0
-    MTQyM2VjNGExNzEzYjgzOGIxNDJkMjkxNWJmY2FkMTYyYjkzNDg2M2U0OWMw
-    MzVmZDc3YzNjNjAxNmU1ZGY0ZGIxMWQwZTNjMWFhYWZiNzAxODI=
+    ODg3YTQ4MjY3ZWJkNTY5ZWU0MDZkZWI1ZjQxZDUxYmU0MDYzM2UxNzY3NjM1
+    MWFkOTEyMDJhYjQxMGU2YjcyMDQ4ZmVjMDZlNjQxNTJjNDNlZjgwOGY1N2I0
+    OTVkNmQ2NzBlOGM0NzlhOTA1MTVhOGM0MjI1ZWVhNjQxM2IxMzA=
   data.tar.gz: !binary |-
-    ZmY2ZWFjYzA1YWQ1MDc3Y2Y4YjUyMjhkZGFmYzFmY2Y3YThlZTlhMGU3NTIy
-    MWRhZWVhN2U5MGQ5NjVlYjZhN2M4NTJhOGIwZmVhNTFkMzdmODFhZDU2ZGRi
-    MTk4YzQxN2RkZDE3YmUzY2YyODk5NGFiMGU3MmYxMmFjMzA0YzY=
+    Y2IxNTAyNzQxNDUzN2MzMzA3NjllY2IxMzU3OGE5YmIxODAxNWFmYTExNTI2
+    MzYxODYwYmRlNzExZDdiZjc4MTU4ZDZmYzgyNGE3MmI4MzMyYTAyMDZmNDU2
+    NzFhY2E4YzZhNTEzMjg4ZjY4YWQyMmFkZjFlZDA1NTc2ZWM1YjU=

data/bin/cf

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 # vim: ft=ruby
+libdir = File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 require "rubygems"
 

data/lib/cf/cli.rb

@@ -1,9 +1,10 @@
 require "yaml"
 require "socket"
 require "net/http"
+require "json/ext"
 require "multi_json"
+require "multi_json/adapters/json_gem"
 require "fileutils"
-
 require "mothership"
 
 require "cfoundry"
@@ -321,11 +322,7 @@ EOS
     end
 
     def sane_target_url(url)
-      unless url =~ /^https?:\/\//
-        prefix = can_connect_on_https?(url) ? "https://" : "http://"
-        url = prefix + url
-      end
-
+      url = "https://#{url}" if url !~ /^http/
       url.gsub(/\/$/, "")
     end
 
@@ -487,17 +484,6 @@ EOS
 
     private
 
-    def can_connect_on_https?(unqualified_url)
-      begin
-        Timeout.timeout(1) do
-          TCPSocket.new(unqualified_url, Net::HTTP.https_default_port)
-        end
-        true
-      rescue Errno::ECONNREFUSED, SocketError, Timeout::Error, Errno::ETIMEDOUT
-        false
-      end
-    end
-
     def target_file
       File.expand_path(CF::TARGET_FILE)
     end

data/lib/cf/cli/populators/target.rb

@@ -6,8 +6,9 @@ module CF
     class Target < Base
       def populate_and_save!
         organization = CF::Populators::Organization.new(input).populate_and_save!
-        CF::Populators::Space.new(input, organization).populate_and_save!
+
+        CF::Populators::Space.new(input, organization).populate_and_save! unless organization.nil?
       end
     end
   end
-end
+end

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "5.2.1.rc8".freeze
+  VERSION = "5.2.1.rc9".freeze
 end

data/lib/tasks/windows_build.rake

@@ -0,0 +1,14 @@
+# In order for this to work you'll need to install the following on the Windows box:
+#  git
+#  RubyInstaller (1.9.3)
+#  DevKit from RubyInstaller (tdm 32-bit to match 1.9.3)
+#
+#  gem install bundler
+#  bundle
+#  rake windows:build
+namespace :windows do
+  desc "Create a Windows .exe file"
+  task :build, [:version] do |_, args|
+    system("ocra --console --no-autoload bin/cf")
+  end
+end

data/spec/cf/cli/populators/target_spec.rb

@@ -1,25 +1,39 @@
 require "spec_helper"
 
 module CF
-  module Populators
-    describe Target do
+    describe Populators::Target do
       describe "#populate_and_save!" do
         let(:input) { double(:input) }
-        let(:organization) { double(:organization) }
-        let(:space) { double(:space) }
+        let(:organization_populator) { double(Populators::Organization) }
+        let(:space_populator) { double(Populators::Space) }
 
         def execute_populate_and_save
-          Target.new(input).populate_and_save!
+          Populators::Target.new(input).populate_and_save!
         end
 
-        it "uses a organization then a space populator" do
-          organization.should_receive(:populate_and_save!).and_return(organization)
-          space.should_receive(:populate_and_save!)
-          Organization.should_receive(:new).with(input).and_return(organization)
-          Space.should_receive(:new).with(input, organization).and_return(space)
+        context 'when there are no orgs' do
+          it 'does not try to populate the space' do
+            Populators::Organization.stub(:new).and_return(organization_populator)
+            organization_populator.stub(:populate_and_save!).and_return(nil)
+
+            Populators::Space.stub(:new).and_return(space_populator)
+            space_populator.should_not receive(:populate_and_save!)
+
+            execute_populate_and_save
+          end
+        end
+
+        it "uses a organization_populator then a space_populator populator" do
+          Populators::Organization.should_receive(:new).with(input).and_return(organization_populator)
+
+          cfoundry_organization = double(CFoundry::V2::Organization)
+          organization_populator.should_receive(:populate_and_save!).and_return(cfoundry_organization)
+
+          Populators::Space.should_receive(:new).with(input, cfoundry_organization).and_return(space_populator)
+          space_populator.should_receive(:populate_and_save!)
+
           execute_populate_and_save
         end
       end
     end
-  end
 end

data/spec/cf/cli/start/target_spec.rb

@@ -59,7 +59,7 @@ module CF
             subject { cf ["target", target] }
 
             context "when the target is not valid" do
-              before { WebMock.stub_request(:get, "http://#{target}/info").to_return(:body => "{}") }
+              before { WebMock.stub_request(:get, "https://#{target}/info").to_return(:body => "{}") }
 
               it "should still be able to switch to a valid target after that" do
                 subject

data/spec/cf/cli_spec.rb

@@ -461,73 +461,13 @@ module CF
     end
 
     describe "#sane_target_url" do
-      subject(:sane_target_url) { context.sane_target_url(input_url)}
-      context "when the given url has an http(s) scheme as a prefix" do
-        let(:input_url) { "http://example.com" }
-        it "removes any trailing slashes" do
-          expect(sane_target_url).to eq "http://example.com"
-        end
+      it "removes any trailing slashes" do
+        expect(context.sane_target_url("http://example.com/")).to eq "http://example.com"
+        expect(context.sane_target_url("https://example.com/")).to eq "https://example.com"
       end
 
-      context "when the given url has no http(s) scheme" do
-        let(:input_url) { "example.com" }
-        context "when the url can be reached via https" do
-          before do
-            TCPSocket.stub(:new).with(input_url, Net::HTTP.https_default_port)
-          end
-
-          it "prepends 'https' to the url" do
-            expect(sane_target_url).to eq "https://example.com"
-          end
-        end
-
-        context "when the url cannot be reached via https" do
-          before do
-            TCPSocket.stub(:new).with(input_url, Net::HTTP.https_default_port).and_raise error
-          end
-
-          context "due to ECONNREFUSED" do
-            let(:error) { Errno::ECONNREFUSED }
-            it "prepends 'http' to the url" do
-              expect(sane_target_url).to eq "http://example.com"
-            end
-          end
-
-          context "due to a SocketError" do
-            let(:error) { SocketError }
-            it "prepends 'http' to the url" do
-              expect(sane_target_url).to eq "http://example.com"
-            end
-          end
-
-          context "due to ETIMEDOUT" do
-            let(:error) { Errno::ETIMEDOUT }
-            it "prepends 'http' to the url" do
-              expect(sane_target_url).to eq "http://example.com"
-            end
-          end
-        end
-
-        context "when the TCP connection times out" do
-          let(:current_time) { Time.now }
-
-          before do
-            TCPSocket.stub(:new).with(input_url, Net::HTTP.https_default_port) {
-              sleep 10
-            }
-          end
-
-          it "prepends 'http' to the url" do
-            expect(sane_target_url).to eq "http://example.com"
-          end
-
-          it "times out after one second" do
-            start_time = Time.now
-            sane_target_url
-            end_time = Time.now
-            expect(end_time).to be_within(0.5).of(start_time + 1)
-          end
-        end
+      it "defaults to https when the given url has no http(s) scheme" do
+        expect(context.sane_target_url("example.com")).to eq "https://example.com"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 5.2.1.rc8
+  version: 5.2.1.rc9
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -137,6 +137,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: anchorman
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: blue-shell
   requirement: !ruby/object:Gem::Requirement
@@ -207,6 +221,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ocra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -400,6 +428,7 @@ files:
 - lib/micro/switcher/windows.rb
 - lib/micro/vmrun.rb
 - lib/tasks/gem_release.rake
+- lib/tasks/windows_build.rake
 - lib/tunnel/config/clients.yml
 - lib/tunnel/helper-app/Gemfile
 - lib/tunnel/helper-app/Gemfile.lock