ubalo 0.0.12 → 0.0.13

data/bin/ubalo

@@ -45,7 +45,7 @@ end
 
 def local_config
   unless @local_config
-    raise "Please run this command from within a local pod directory"
+    raise UbaloMessage, "Please run this command from within a local pod directory"
   end
   @local_config
 end
@@ -110,7 +110,7 @@ def process_download response, destination_path=nil
   destination_path ||= name
 
   if File.exists?(destination_path)
-    raise "directory #{destination_path.inspect} already exists"
+    raise UbaloMessage, "directory #{destination_path.inspect} already exists"
   end
 
   FileUtils.mkdir(destination_path)
@@ -160,20 +160,20 @@ command :create do |c|
     else
       pod_name = hl.ask("New pod name: ")
       if pod_name.empty?
-        raise "No pod name given"
+        raise UbaloMessage, "No pod name given"
       end
     end
     destination_path = pod_name
 
     if File.exists?(pod_name)
-      raise "directory #{destination_path} already exists, giving up."
+      raise UbaloMessage, "directory #{destination_path} already exists, giving up."
     end
 
     templates = ubalo.available_templates
     if options['type']
       pod_type = options['type']
       unless templates.include? pod_type
-        raise "Invalid pod type"
+        raise UbaloMessage, "Invalid pod type"
       end
     else
       pod_type = hl.choose do |menu|
@@ -458,8 +458,7 @@ pre do |global,command,options,args|
   end
 
   unless token or (command && command.name == :login)
-    $stderr.puts "No credentials found. Please run 'ubalo login'."
-    raise UbaloExit, 1
+    raise UbaloMessage, "No credentials found. Please run 'ubalo login'."
   end
 
   local_config_filename = ".ubalo/config"
@@ -493,6 +492,9 @@ on_error do |exception|
   when UbaloMessage
     $stderr.puts "Error: #{exception.message}"
     exit 1
+  when Interrupt
+    $stderr.puts "Cancelled!"
+    exit 1
   else
     $stderr.puts "Error! Unfortunately something went wrong. Please contact us: errors@ubalo.com."
     raise  # and go on to raise

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-07 00:00:00.000000000Z
+date: 2011-12-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &2156840200 !ruby/object:Gem::Requirement
+  requirement: &2156840040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156840200
+  version_requirements: *2156840040
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2156839340 !ruby/object:Gem::Requirement
+  requirement: &2156839200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156839340
+  version_requirements: *2156839200
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &2156838140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2156838140
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2156838200 !ruby/object:Gem::Requirement
+  requirement: &2156837500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +54,7 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *2156838200
+  version_requirements: *2156837500
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables: