bushido 0.0.3 → 0.0.4

data/bin/bushido

@@ -3,10 +3,11 @@ require 'bushido'
 
 options = {}
 
-commands = [:reauth, :claim,  :list, :create, :show, :start, :stop, :restart, :update, :open]
+commands = [:reauth, :remove_account, :claim,  :list, :create, :show, :start, :stop, :restart, :update, :open]
 
 help_docs = {
   :reauth => "bushido reauth - Reauthorize this machine to work under your Bushido account",
+  :remove_account => "bushido remove_account - Removes all Bushido information from this machine",
   :claim => "bushido claim [NAME] - Claim a running Bushido app as your own",
   :list => "bushido list - List all of your deployed Bushido apps",
   :create => "bushido create [URL] - Deploy a Bushido app from a git repository in URL",
@@ -47,16 +48,17 @@ command = ARGV.first
 
 if command
   case command.downcase.to_sym
-  when :reauth  then Bushido::User.reauth
-  when :claim   then Bushido::App.claim(ARGV[1])
-  when :list    then Bushido::App.list()
-  when :create  then Bushido::App.create(ARGV[1])
-  when :show    then Bushido::App.show(ARGV[1])
-  when :start   then Bushido::App.start(ARGV[1])
-  when :stop    then Bushido::App.stop(ARGV[1])
-  when :restart then Bushido::App.restart(ARGV[1])
-  when :update  then Bushido::App.update(ARGV[1])
-  when :open    then Bushido::App.open(ARGV[1])
+  when :reauth          then Bushido::User.reauth
+  when :remove_account  then Bushido::User.clear_config
+  when :claim           then Bushido::App.claim(ARGV[1])
+  when :list            then Bushido::App.list()
+  when :create          then Bushido::App.create(ARGV[1])
+  when :show            then Bushido::App.show(ARGV[1])
+  when :start           then Bushido::App.start(ARGV[1])
+  when :stop            then Bushido::App.stop(ARGV[1])
+  when :restart         then Bushido::App.restart(ARGV[1])
+  when :update          then Bushido::App.update(ARGV[1])
+  when :open            then Bushido::App.open(ARGV[1])
   end
 else
   puts "usage: bushido <command>\n\nSee bushido -h for more detailed instructions"

data/bushido.gemspec

@@ -10,7 +10,9 @@ Gem::Specification.new do |s|
   s.email       = ["s@bushi.do"]
   s.homepage    = "http://trapm.com"
   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 apps, to claiming, restarting, and updating existing apps}
+  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.add_dependency "rest-client"
 
   s.rubyforge_project = "bushido"
 

data/lib/bushido/app.rb

@@ -2,7 +2,9 @@ module Bushido
   class App
     class << self
       def create(url)
-        puts "Creating account for #{Bushido::User.email}..."
+        Bushido::User.load_account
+
+        puts "Creating from #{url} for #{Bushido::User.email}..."
 
         post({:app => {:url => url}})
       end
@@ -30,35 +32,12 @@ module Bushido
         url = "#{Temple}/apps/#{app}.json"
         params = {:command => command}
 
-        show_response Bushido::Command.put_command(url, params)
+        Bushido::Command.show_response Bushido::Command.put_command(url, params)
       end
 
       def post(params)
         url = "#{Temple}/apps"
-        show_response Bushido::Command.post_command(url, params)
-      end
-
-      def show_response(response)
-        show_messages response
-        show_errors   response
-      end
-
-      def show_messages(response)
-        if response["messages"]
-          puts "Messages:"
-          response["messages"].each_with_index do |error, counter|
-            puts "\t#{counter + 1}. #{error}"
-          end
-        end
-      end
-
-      def show_errors(response)
-        if response["errors"]
-          puts "Errors:"
-          response["errors"].each_with_index do |error, counter|
-            puts "\t#{counter + 1}. #{error}"
-          end
-        end
+        Bushido::Command.show_response Bushido::Command.post_command(url, params)
       end
 
       def show(name)

data/lib/bushido/command.rb

@@ -15,12 +15,43 @@ module Bushido
         response = JSON.parse raw    
       end
 
-      def put_command(url, params)
-        Bushido::Utils.while_authorized do
+      def put_command(url, params, meta={})
+        if meta[:force]
           params.merge!({:auth_token => Bushido::User.authentication_token}) if params[:auth_token].nil? unless Bushido::User.authentication_token.nil?
 
           raw = RestClient.put(url, params.to_json,  :content_type => :json)
           response = JSON.parse raw
+
+        else
+          Bushido::Utils.while_authorized do
+            params.merge!({:auth_token => Bushido::User.authentication_token}) if params[:auth_token].nil? unless Bushido::User.authentication_token.nil?
+
+            raw = RestClient.put(url, params.to_json,  :content_type => :json)
+            response = JSON.parse raw
+          end
+        end
+      end
+
+      def show_response(response)
+        show_messages response
+        show_errors   response
+      end
+
+      def show_messages(response)
+        if response["messages"]
+          puts "Messages:"
+          response["messages"].each_with_index do |error, counter|
+            puts "\t#{counter + 1}. #{error}"
+          end
+        end
+      end
+
+      def show_errors(response)
+        if response["errors"]
+          puts "Errors:"
+          response["errors"].each_with_index do |error, counter|
+            puts "\t#{counter + 1}. #{error}"
+          end
         end
       end
     end

data/lib/bushido/user.rb

@@ -5,42 +5,43 @@ module Bushido
         load_config || {}
       end
 
+      def clear_config
+        print "Clearing out all local bushido configuration..."
+        FileUtils.rm_rf "#{Bushido::Utils.home_directory}/.bushido/"
+        puts "done"
+      end
+
       def load_config
         begin
-          return JSON.parse(File.open(File.expand_path("~/.bushido/config.json"), 'r') { |l| l.read })
+          return JSON.parse(File.open(File.expand_path("#{Bushido::Utils.home_directory}/.bushido/config.json"), 'r') { |l| l.read })
         rescue Errno::ENOENT
         end
       end
 
       def load_account
         begin
-          @account = JSON.parse(File.open(File.expand_path("~/.bushido/config.json"), 'r') { |l| l.read })
+          @account = JSON.parse(File.open(File.expand_path("#{Bushido::Utils.home_directory}/.bushido/config.json"), 'r') { |l| l.read })
         rescue Errno::ENOENT
-          @account = retrieve_account
+          @account = retrieve_account("Couldn't find your Bushido config on this machine.")
         end
       end
 
       def reauth
-        retrieve_account
+        retrieve_account("Re-authenticating your account.")
       end
 
       def update_account(account)
         print "Storing account information..."
-        File.open(File.expand_path("~/.bushido/config.json"), 'w') { |f| f.write(account.to_json) }
+        Dir.mkdir "#{Bushido::Utils.home_directory}/.bushido" unless Dir.exists? "#{Bushido::Utils.home_directory}/.bushido"
+        File.open(File.expand_path("#{Bushido::Utils.home_directory}/.bushido/config.json"), 'w') { |f| f.write(account.to_json) }
         puts " Done!"
       end
 
-      def retrieve_account
+      def retrieve_account(msg)
+        puts "#{msg} Enter your username and password, and we'll either retrieve if from your existing account on our servers, or create a new account for you."
         credentials = self.prompt_for_credentials
 
-        raw = RestClient.get "#{Bushido::Temple}/users/verify.json", {:params => {:email => credentials[:email], :password => credentials[:password]}, :accept => :json}
-
-        begin
-          result = JSON.parse(raw)
-        rescue
-          puts "Our servers didn't respond properly while trying to retrieve the account, this seems to be an issue on our end. Please email us at support@bushi.do to clear this up."
-          exit 1
-        end
+        result = Bushido::Command.put_command "#{Bushido::Temple}/users/verify", {:email => credentials[:email], :password => credentials[:password]}, {:force => true}
 
         if result["authentication_token"] and result["error"].nil?
           update_account({:email => credentials[:email], :authentication_token => result["authentication_token"]})
@@ -49,7 +50,7 @@ module Bushido
           puts result["error"]
           if result["error_type"] == "verification_failure"
             puts ""
-            print "If this is your first time using Bushido, would you like to create an account using the email and password you just entered?\n[y/n]"
+            print "If this is your first time using Bushido, would you like to create an account using the email and password you just entered?\n[y/n] "
             if $stdin.gets.chomp == "y"
               self.create_account(credentials)
             else
@@ -61,31 +62,16 @@ module Bushido
 
       def create_account(credentials)
         # GET instead of POST because of AuthenticityToken issues. Deal with it later.
-        begin 
-          raw = RestClient.get "#{Bushido::Temple}/users/create.json", {:params => {:email => credentials[:email], :password => credentials[:password], :accept => :json}}
-        rescue RestClient::UnprocessableEntity
-          puts "We ran into an error registering, either our site is down or that name is registered."
-          exit 1
-        end
+        result = Bushido::Command.post_command "#{Bushido::Temple}/users/create.json", {:email => credentials[:email], :password => credentials[:password]}
 
-        begin
-          result = JSON.parse(raw)
-          #puts result.inspect
-          #puts "----------------------------------------------------------------------"
-        rescue JSON::ParserError
-          puts "Our servers didn't respond properly while trying to create an account, this seems to be an issue on our end. Please email us at support@bushi.do to clear this up."
-          exit 1
-        end
+        Bushido::Command.show_response result
 
-        if result["errors"]
-          puts "There were some errors registering: "
-          
-          result["errors"].each_pair { |field, error| puts "  #{field.capitalize} #{error}" }
+        if result["errors"].nil?
+          update_account result
+          return credentials
+        else
           exit 1
         end
-
-        update_account result
-        return credentials
       end
 
       def authentication_token

data/lib/bushido/utils.rb

@@ -9,6 +9,10 @@ module Bushido
           yield
         end
       end
+
+      def home_directory
+        ENV['HOME']
+      end
     end
   end
 end

data/lib/bushido/version.rb

@@ -1,3 +1,3 @@
 module Bushido
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Sean Grove
@@ -16,9 +16,21 @@ cert_chain: []
 
 date: 2011-01-26 00:00:00 -08:00
 default_executable: 
-dependencies: []
-
-description: A command line tool to do everything with bushido, from signing up and deploying apps, to claiming, restarting, and updating existing apps
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rest-client
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+description: A command line tool to do everything with bushido, from signing up and deploying new apps, to claiming, restarting, and updating existing apps
 email: 
 - s@bushi.do
 executables: