jdc 0.2.3.pre → 0.2.3

data/lib/jdc/cli/app/delete.rb

@@ -8,7 +8,7 @@ module JDC::App
     group :apps, :manage
     input :apps, :desc => "Applications to delete", :argument => :splat,
           :singular => :app, :from_given => by_name(:app)
-    input :routes, :desc => "Delete associated routes", :default => false
+    input :routes, :desc => "Delete associated routes", :default => true
     input :delete_orphaned, :desc => "Delete orphaned services",
           :aliases => "-o", :default => proc { force? ? false : interact },
           :forget => true

data/lib/jdc/cli/route/map.rb

@@ -23,6 +23,8 @@ module JDC::Route
 
       route = find_or_create_route(domain, host, space)
 
+      fail "Invalid host '#{host}'" unless route
+
       bind_route(route, app) if app
     end
 
@@ -35,7 +37,8 @@ module JDC::Route
     end
 
     def find_or_create_route(domain, host, space)
-      find_route(domain, host) || create_route(domain, host, space)
+      #find_route(domain, host) || create_route(domain, host, space)
+      find_route(domain, host)
     end
 
     def find_route(domain, host)

data/lib/jdc/cli/space/switch.rb

@@ -1,5 +1,5 @@
 require "jdc/cli/space/base"
-=begin
+
 module JDC::Space
   class Switch < Base
     desc "Switch to a space"
@@ -16,4 +16,3 @@ module JDC::Space
     end
   end
 end
-=end

data/lib/jdc/cli/start/target.rb

@@ -19,7 +19,7 @@ module JDC::Start
 
       if input.has?(:url)
         target = sane_target_url(input[:url])
-        with_progress("Setting target to #{c(target, :name)}") do
+        with_progress("Setting target to #{c(target, :name)}\n") do
           begin
             build_client(target).info # check that it's valid before setting
           rescue JFoundry::TargetRefused

data/lib/jdc/cli.rb

@@ -363,8 +363,10 @@ EOS
     def sane_target_url(url)
       unless url =~ /^https?:\/\//
         begin
-          TCPSocket.new(url, Net::HTTP.https_default_port)
-          url = "https://#{url}"
+          #TCPSocket.new(url, Net::HTTP.https_default_port)
+          #url = "https://#{url}"
+          TCPSocket.new(url, Net::HTTP.http_default_port)
+          url = "http://#{url}"
         rescue Errno::ECONNREFUSED, SocketError, Timeout::Error
           url = "http://#{url}"
         end
@@ -496,7 +498,7 @@ EOS
     end
 
     def build_client(target)
-      client = JFoundry::V2::Client.new(target, ENV['ACCESS_KEY'], ENV['SECRET_KEY'], JDC::VERSION)
+      client = JFoundry::V2::Client.new(target, ENV['ACCESS_KEY'], ENV['SECRET_KEY'], JDC::VERSION, "jdc")
       client.http_proxy = input[:http_proxy] || ENV['HTTP_PROXY'] || ENV['http_proxy']
       client.https_proxy = input[:https_proxy] || ENV['HTTPS_PROXY'] || ENV['https_proxy']
       client

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: jdc
 version: !ruby/object:Gem::Version
-  version: 0.2.3.pre
-  prerelease: 6
+  version: 0.2.3
+  prerelease: 
 platform: ruby
 authors:
 - Jing Dong Foundry Team
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &22461240 !ruby/object:Gem::Requirement
+  requirement: &19463900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *22461240
+  version_requirements: *19463900
 - !ruby/object:Gem::Dependency
   name: caldecott-client
-  requirement: &22460740 !ruby/object:Gem::Requirement
+  requirement: &19462080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,21 +33,21 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *22460740
+  version_requirements: *19462080
 - !ruby/object:Gem::Dependency
   name: jfoundry
-  requirement: &22460280 !ruby/object:Gem::Requirement
+  requirement: &19804100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *22460280
+  version_requirements: *19804100
 - !ruby/object:Gem::Dependency
   name: interact
-  requirement: &22520840 !ruby/object:Gem::Requirement
+  requirement: &19803640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *22520840
+  version_requirements: *19803640
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &22520380 !ruby/object:Gem::Requirement
+  requirement: &19803180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *22520380
+  version_requirements: *19803180
 - !ruby/object:Gem::Dependency
   name: mothership
-  requirement: &22519900 !ruby/object:Gem::Requirement
+  requirement: &19802700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -80,10 +80,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *22519900
+  version_requirements: *19802700
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &22519180 !ruby/object:Gem::Requirement
+  requirement: &19801980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -91,10 +91,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *22519180
+  version_requirements: *19801980
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &22518720 !ruby/object:Gem::Requirement
+  requirement: &19801520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -102,10 +102,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *22518720
+  version_requirements: *19801520
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &22518260 !ruby/object:Gem::Requirement
+  requirement: &19801060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -113,10 +113,10 @@ dependencies:
         version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *22518260
+  version_requirements: *19801060
 - !ruby/object:Gem::Dependency
   name: blue-shell
-  requirement: &22517800 !ruby/object:Gem::Requirement
+  requirement: &19800600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -124,10 +124,10 @@ dependencies:
         version: 0.2.1
   type: :development
   prerelease: false
-  version_requirements: *22517800
+  version_requirements: *19800600
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &22517420 !ruby/object:Gem::Requirement
+  requirement: &19800220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -135,10 +135,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22517420
+  version_requirements: *19800220
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &22516880 !ruby/object:Gem::Requirement
+  requirement: &19799680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -146,10 +146,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *22516880
+  version_requirements: *19799680
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &22516380 !ruby/object:Gem::Requirement
+  requirement: &19799180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -157,10 +157,10 @@ dependencies:
         version: '1.15'
   type: :development
   prerelease: false
-  version_requirements: *22516380
+  version_requirements: *19799180
 - !ruby/object:Gem::Dependency
   name: gem-release
-  requirement: &22516000 !ruby/object:Gem::Requirement
+  requirement: &19798800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -168,10 +168,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22516000
+  version_requirements: *19798800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &22515460 !ruby/object:Gem::Requirement
+  requirement: &19798260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -179,10 +179,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *22515460
+  version_requirements: *19798260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &22514960 !ruby/object:Gem::Requirement
+  requirement: &19797760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -190,10 +190,10 @@ dependencies:
         version: '2.14'
   type: :development
   prerelease: false
-  version_requirements: *22514960
+  version_requirements: *19797760
 - !ruby/object:Gem::Dependency
   name: rspec-instafail
-  requirement: &22514500 !ruby/object:Gem::Requirement
+  requirement: &19797300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -201,10 +201,10 @@ dependencies:
         version: 0.2.4
   type: :development
   prerelease: false
-  version_requirements: *22514500
+  version_requirements: *19797300
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &22514040 !ruby/object:Gem::Requirement
+  requirement: &19796840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -212,10 +212,10 @@ dependencies:
         version: '1.9'
   type: :development
   prerelease: false
-  version_requirements: *22514040
+  version_requirements: *19796840
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &22513580 !ruby/object:Gem::Requirement
+  requirement: &19796380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -223,10 +223,10 @@ dependencies:
         version: '2.3'
   type: :development
   prerelease: false
-  version_requirements: *22513580
+  version_requirements: *19796380
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &22513200 !ruby/object:Gem::Requirement
+  requirement: &19796000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -234,10 +234,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22513200
+  version_requirements: *19796000
 - !ruby/object:Gem::Dependency
   name: nats
-  requirement: &22148820 !ruby/object:Gem::Requirement
+  requirement: &19457180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -245,10 +245,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22148820
+  version_requirements: *19457180
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &22544720 !ruby/object:Gem::Requirement
+  requirement: &19455720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -256,10 +256,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22544720
+  version_requirements: *19455720
 - !ruby/object:Gem::Dependency
   name: anchorman
-  requirement: &22544300 !ruby/object:Gem::Requirement
+  requirement: &19454320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -267,7 +267,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22544300
+  version_requirements: *19454320
 description: 
 email:
 - jae@jd.com
@@ -411,9 +411,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: jdc
 rubygems_version: 1.8.11