jdc 0.2.2.pre → 0.2.2

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

@@ -103,13 +103,13 @@ module JDC
           info_changed = true
       end
 
-      if info_changed
-        save_target_info(info, client.target)
-      end
+      save_target_info(info, client.target) unless !info_changed
 
-      unless info.key? :organization
-        client.current_organization = JDC::Populators::Organization.new(input).populate_and_save!
-        client.current_space = JDC::Populators::Space.new(input, client.current_organization).populate_and_save!
+      if @@client.try(:current_user).try(:email) != nil
+        unless info.key? :organization
+            client.current_organization = JDC::Populators::Organization.new(input).populate_and_save!
+            client.current_space = JDC::Populators::Space.new(input, client.current_organization).populate_and_save!
+        end
       end
     end
 
@@ -481,9 +481,11 @@ EOS
 
       save_target_info(info, target) unless !info_changed
 
-      unless info.key? :organization
-        @@client.current_organization = JDC::Populators::Organization.new(input).populate_and_save!
-        @@client.current_space = JDC::Populators::Space.new(input, @@client.current_organization).populate_and_save!
+      if @@client.try(:current_user).try(:email) != nil
+        unless info.key? :organization
+            @@client.current_organization = JDC::Populators::Organization.new(input).populate_and_save!
+            @@client.current_space = JDC::Populators::Space.new(input, @@client.current_organization).populate_and_save!
+        end
       end
 
       @@client.current_organization = @@client.organization(info[:organization]) if info[:organization]

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: jdc
 version: !ruby/object:Gem::Version
-  version: 0.2.2.pre
-  prerelease: 6
+  version: 0.2.2
+  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: &13161460 !ruby/object:Gem::Requirement
+  requirement: &8720580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *13161460
+  version_requirements: *8720580
 - !ruby/object:Gem::Dependency
   name: caldecott-client
-  requirement: &13160960 !ruby/object:Gem::Requirement
+  requirement: &9405360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,21 +33,21 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *13160960
+  version_requirements: *9405360
 - !ruby/object:Gem::Dependency
   name: jfoundry
-  requirement: &13202480 !ruby/object:Gem::Requirement
+  requirement: &9401680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *13202480
+  version_requirements: *9401680
 - !ruby/object:Gem::Dependency
   name: interact
-  requirement: &13202020 !ruby/object:Gem::Requirement
+  requirement: &9400500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *13202020
+  version_requirements: *9400500
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &13201560 !ruby/object:Gem::Requirement
+  requirement: &9398880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *13201560
+  version_requirements: *9398880
 - !ruby/object:Gem::Dependency
   name: mothership
-  requirement: &13201080 !ruby/object:Gem::Requirement
+  requirement: &9064640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -80,10 +80,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *13201080
+  version_requirements: *9064640
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &13200360 !ruby/object:Gem::Requirement
+  requirement: &9063920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -91,10 +91,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *13200360
+  version_requirements: *9063920
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &13199900 !ruby/object:Gem::Requirement
+  requirement: &9063460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -102,10 +102,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *13199900
+  version_requirements: *9063460
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &13199440 !ruby/object:Gem::Requirement
+  requirement: &9063000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -113,10 +113,10 @@ dependencies:
         version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *13199440
+  version_requirements: *9063000
 - !ruby/object:Gem::Dependency
   name: blue-shell
-  requirement: &13198980 !ruby/object:Gem::Requirement
+  requirement: &9062540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -124,10 +124,10 @@ dependencies:
         version: 0.2.1
   type: :development
   prerelease: false
-  version_requirements: *13198980
+  version_requirements: *9062540
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &13198600 !ruby/object:Gem::Requirement
+  requirement: &9062160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -135,10 +135,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13198600
+  version_requirements: *9062160
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &13198060 !ruby/object:Gem::Requirement
+  requirement: &9061620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -146,10 +146,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *13198060
+  version_requirements: *9061620
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &13197560 !ruby/object:Gem::Requirement
+  requirement: &9061120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -157,10 +157,10 @@ dependencies:
         version: '1.15'
   type: :development
   prerelease: false
-  version_requirements: *13197560
+  version_requirements: *9061120
 - !ruby/object:Gem::Dependency
   name: gem-release
-  requirement: &13197180 !ruby/object:Gem::Requirement
+  requirement: &9060740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -168,10 +168,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13197180
+  version_requirements: *9060740
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &13196640 !ruby/object:Gem::Requirement
+  requirement: &9060200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -179,10 +179,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *13196640
+  version_requirements: *9060200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13196140 !ruby/object:Gem::Requirement
+  requirement: &9059700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -190,10 +190,10 @@ dependencies:
         version: '2.14'
   type: :development
   prerelease: false
-  version_requirements: *13196140
+  version_requirements: *9059700
 - !ruby/object:Gem::Dependency
   name: rspec-instafail
-  requirement: &13195680 !ruby/object:Gem::Requirement
+  requirement: &9059240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -201,10 +201,10 @@ dependencies:
         version: 0.2.4
   type: :development
   prerelease: false
-  version_requirements: *13195680
+  version_requirements: *9059240
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &13195220 !ruby/object:Gem::Requirement
+  requirement: &9058780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -212,10 +212,10 @@ dependencies:
         version: '1.9'
   type: :development
   prerelease: false
-  version_requirements: *13195220
+  version_requirements: *9058780
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &13194760 !ruby/object:Gem::Requirement
+  requirement: &9058320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -223,10 +223,10 @@ dependencies:
         version: '2.3'
   type: :development
   prerelease: false
-  version_requirements: *13194760
+  version_requirements: *9058320
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &13194380 !ruby/object:Gem::Requirement
+  requirement: &9057940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -234,10 +234,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13194380
+  version_requirements: *9057940
 - !ruby/object:Gem::Dependency
   name: nats
-  requirement: &13272460 !ruby/object:Gem::Requirement
+  requirement: &9057480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -245,10 +245,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13272460
+  version_requirements: *9057480
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &13272040 !ruby/object:Gem::Requirement
+  requirement: &9057060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -256,10 +256,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13272040
+  version_requirements: *9057060
 - !ruby/object:Gem::Dependency
   name: anchorman
-  requirement: &13271620 !ruby/object:Gem::Requirement
+  requirement: &9056640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -267,7 +267,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13271620
+  version_requirements: *9056640
 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