bushido 0.0.11 → 0.0.12

data/bushido.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email       = ["s@bushi.do"]
   s.homepage    = "http://gem.bushi.do"
   s.summary     = %q{Command-lin interface for bushi.do}
-  s.description = %q{A command line tool to do everything with bushido, from signing up and deploying new apps, to claiming, restarting, and updating existing apps}
+  s.description = %q{A module for a Bushido app to manipulate everything about itself while running on Bushido, from deploying new apps, to claiming, restarting, updating existing apps, changing public domain, subdomains, etc.}
 
   s.add_dependency "rest-client", ">=1.6.1"
   s.add_dependency "json",        ">=1.4.6"

data/lib/bushido/app.rb

@@ -50,11 +50,17 @@ module Bushido
 
       def add_var(key, value)
         put :add_var, {:key => key, :value => value}
+        if Bushido::Command.last_command_successful?
+          ENV[key.upcase] = value
+        end
       end
 
 
       def remove_var(key)
         put :remove_var, {:key => key}
+        if Bushido::Command.last_command_successful?
+          ENV[key.upcase] = nil
+        end
       end
 
 
@@ -78,17 +84,24 @@ module Bushido
 
 
       def set_subdomain(subdomain)
-        put :set_subdomain, {:subdomain => subdomain}
+        result = put :set_subdomain!, {:subdomain => subdomain}
+        if Bushido::Command.last_command_successful?
+          ENV["BUSHIDO_SUBDOMAIN"] = subdomain
+          ENV["PUBLIC_URL"] = "http://#{subdomain}.#{ENV['APP_TLD']}/"
+          return result
+        end
+
+        result
       end
 
 
       def add_domain(domain)
-        put :add_domain, {:domain => domain}
+        put :add_domain!, {:domain => domain}
       end
 
 
       def remove_domain(domain)
-        put :remove_domain, {:domain => domain}
+        put :remove_domain!, {:domain => domain}
       end
 
 

data/lib/bushido/command.rb

@@ -2,6 +2,7 @@ module Bushido
   class Command
     @@last_request  = nil
     @@request_count = 0
+    @@last_request_successful = true
 
     class << self
       def request_count
@@ -12,7 +13,15 @@ module Bushido
         @@request_count += 1
         params.merge!({:auth_token => Bushido::Platform.key}) if params[:auth_token].nil? unless Bushido::Platform.key.nil?
 
-        raw = RestClient.get(url, {:params => params, :accept => :json})
+        begin
+          raw = RestClient.get(url, {:params => params, :accept => :json})
+        rescue => e
+          puts e.inspect
+          @@last_request_successful = false
+          return nil
+        end
+
+        @@last_request_successful = true
         @@last_request = JSON.parse raw
       end
 
@@ -20,7 +29,15 @@ module Bushido
         @@request_count += 1
         params.merge!({:auth_token => Bushido::Platform.key}) if params[:auth_token].nil? unless Bushido::Platform.key.nil?
 
-        raw = RestClient.post(url, params.to_json, :content_type => :json, :accept => :json)
+        begin
+          raw = RestClient.post(url, params.to_json, :content_type => :json, :accept => :json)
+        rescue => e
+          puts e.inspect
+          @@last_request_successful = false
+          return nil
+        end
+
+        @@last_request_successful = true
         @@last_request = JSON.parse raw    
       end
 
@@ -29,13 +46,29 @@ module Bushido
         if meta[:force]
           params.merge!({:auth_token => Bushido::Platform.key}) if params[:auth_token].nil? unless Bushido::Platform.key.nil?
 
-          raw = RestClient.put(url, params.to_json,  :content_type => :json)
+          begin
+            raw = RestClient.put(url, params.to_json,  :content_type => :json)
+          rescue => e
+            puts e.inspect
+            @@last_request_successful = false
+            return nil
+          end
+
+          @@last_request_successful = true
           @@last_request = JSON.parse raw
 
         else
           params.merge!({:auth_token => Bushido::Platform.key}) if params[:auth_token].nil? unless Bushido::Platform.key.nil?
 
-          raw = RestClient.put(url, params.to_json,  :content_type => :json)
+          begin
+            raw = RestClient.put(url, params.to_json,  :content_type => :json)
+          rescue => e
+            puts e.inspect
+            @@last_request_successful = false
+            return nil
+          end
+
+          @@last_request_successful = true
           @@last_request = JSON.parse raw
         end
       end
@@ -64,7 +97,7 @@ module Bushido
       end
 
       def last_command_successful?
-        @@last_request.nil? or @@last_request["errors"].nil?
+        @@last_request_successful
       end
 
       def last_command_errored?

data/lib/bushido/utils.rb

@@ -1,6 +1,9 @@
 module Bushido
   class Utils
     class << self
+      # TODO: Make this update all the available ENV variables 
+      def refresh_env!
+      end
     end
   end
 end

data/lib/bushido/version.rb

@@ -1,3 +1,3 @@
 module Bushido
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -2,7 +2,7 @@
 name: bushido
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors: 
 - Sean Grove
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 -07:00
+date: 2011-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,7 @@ dependencies:
         version: 1.6.1
   type: :runtime
   version_requirements: *id003
-description: A command line tool to do everything with bushido, from signing up and deploying new apps, to claiming, restarting, and updating existing apps
+description: A module for a Bushido app to manipulate everything about itself while running on Bushido, from deploying new apps, to claiming, restarting, updating existing apps, changing public domain, subdomains, etc.
 email: 
 - s@bushi.do
 executables: