admin-cf-plugin 0.2.0.rc2 → 0.2.0.rc3

data/lib/admin-cf-plugin/curl.rb

@@ -1,3 +1,5 @@
+require "multi_json"
+
 require "cf/cli"
 
 module CFAdmin
@@ -42,10 +44,15 @@ module CFAdmin
           :payload => body,
           :content => body && content)
 
-      if [:json, "application/json"].include? accept
-        puts MultiJson.dump(res, :pretty => true)
+      body = res[:body]
+
+      type = res[:headers]["content-type"]
+
+      if type && type.include?("application/json")
+        json = MultiJson.load(body)
+        puts MultiJson.dump(json, :pretty => true)
       else
-        puts res
+        puts body
       end
     end
 

data/lib/admin-cf-plugin/version.rb

@@ -1,3 +1,3 @@
 module CFAdmin
-  VERSION = "0.2.0.rc2".freeze
+  VERSION = "0.2.0.rc3".freeze
 end

data/spec/curl_spec.rb

@@ -1,46 +1,61 @@
 require "spec_helper"
 
-describe CFAdmin::Curl do
+command CFAdmin::Curl do
   let(:fake_home_dir) { "#{SPEC_ROOT}/fixtures/fake_home_dir" }
+
   stub_home_dir_with { fake_home_dir }
 
-  subject { cf ["curl", "--mode", "GET", "--path", path] }
+  let(:client) { fake_client }
+
+  context "when the response is JSON" do
+    subject { cf %W[curl GET /foo] }
+
+    it "pretty-prints the response" do
+      stub_request(:get, "http://example.com/foo").to_return(
+        :headers => {
+          "content-type" => "application/json; charset=utf8"
+        },
+        :status => 200,
+        :body => '{"foo":"bar"}'
+      )
+
+      subject
 
-  before do
-    any_instance_of(CFoundry::Client) do |client|
-      stub(client).info { { :version => 2 } }
+      expect(output).to say(<<OUT)
+{
+  "foo": "bar"
+}
+OUT
     end
   end
 
   context "with an implicit target" do
-    let(:path) { "apps/5/instances" }
+    subject { cf %W[curl GET /apps/5/instances] }
 
     it "makes a request to the current target" do
-      stub_request(:get, "https://api.some-target-for-cf-curl.com/apps/5/instances").to_return(
+      stub_request(:get, "http://example.com/apps/5/instances").to_return(
         :status => 200,
         :body => 'some-body'
       )
 
       subject
 
-      expect(stdout.string).to include('"status": "200"')
-      expect(stdout.string).to include('"body": "some-body"')
+      expect(output).to say("some-body")
     end
   end
 
   context "with an explicit target" do
-    let(:path) { "https://example.com/apps/5/instances" }
+    subject { cf %W[curl GET https://some-other-domain.com/apps/5/instances] }
 
     it "makes a request to the given target" do
-      stub_request(:get, "https://example.com/apps/5/instances").to_return(
+      stub_request(:get, "https://some-other-domain.com/apps/5/instances").to_return(
         :status => 200,
         :body => 'some-other-body'
       )
 
       subject
 
-      expect(stdout.string).to include('"status": "200"')
-      expect(stdout.string).to include('"body": "some-other-body"')
+      expect(output).to say("some-other-body")
     end
   end
 end

data/spec/spec_helper.rb

@@ -15,4 +15,5 @@ RSpec.configure do |c|
 
   c.include FakeHomeDir
   c.include CommandHelper
+  c.include ConsoleAppSpeckerMatchers
 end

metadata

@@ -1,59 +1,39 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: admin-cf-plugin
-version: !ruby/object:Gem::Version 
-  hash: 1004116395
+version: !ruby/object:Gem::Version
+  version: 0.2.0.rc3
   prerelease: 6
-  segments: 
-  - 0
-  - 2
-  - 0
-  - rc
-  - 2
-  version: 0.2.0.rc2
 platform: ruby
-authors: 
+authors:
 - Alex Suraci
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-19 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2013-03-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: cfoundry
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1004116459
-        segments: 
-        - 0
-        - 6
-        - 0
-        - rc
-        - 2
-        version: 0.6.0.rc2
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        version: "0.7"
-  prerelease: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   type: :runtime
-  name: cfoundry
-  requirement: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 description: 
-email: 
+email:
 - asuraci@vmware.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Rakefile
 - lib/admin-cf-plugin/curl.rb
 - lib/admin-cf-plugin/guid.rb
@@ -65,40 +45,32 @@ files:
 - spec/spec_helper.rb
 homepage: http://cloudfoundry.com/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -4357441552025755471
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: admin-cf-plugin
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Cloud Foundry administration commands.
-test_files: 
+test_files:
 - spec/curl_spec.rb
 - spec/guid_spec.rb
 - spec/spec_helper.rb