bushido 0.0.9 → 0.0.10

data/.gitignore

@@ -0,0 +1 @@
+Gemfile.lock

data/Rakefile

@@ -1,2 +1,9 @@
+require 'rake/testtask'
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+Rake::TestTask.new do |t|
+  t.libs += ["lib", "test"]
+  t.test_files = FileList['test/test*.rb']
+  t.verbose = true
+end

data/bin/bushido

@@ -1,9 +1,14 @@
 #!/usr/bin/env ruby
-require 'bushido'
+begin
+  require 'bushido'
+rescue LoadError
+  $: << File.expand_path("../../lib", __FILE__)
+  require 'bushido'
+end
 
 options = {}
 
-commands = [:login, :remove_account, :claim,  :list, :create, :show, :start, :stop, :restart, :update, :open, :logs, :add_var, :remove_var, :ssh_key, :api_key].sort
+commands = [:login, :remove_account, :claim,  :list, :create, :show, :start, :stop, :restart, :update, :open, :logs, :add_var, :remove_var, :ssh_key, :api_key].sort_by {|s| s.to_s}
 
 help_docs = {
   :login => "bushido login - Authorizes this machine to work under your Bushido account",
@@ -53,9 +58,6 @@ command = ARGV.first
 
 if command
   case command.downcase.to_sym
-  when :login           then Bushido::User.reauth
-  when :api_key         then Bushido::User.show_api_key
-  when :remove_account  then Bushido::User.clear_config
 
   when :claim           then Bushido::App.claim(ARGV[1])
   when :list            then Bushido::App.list()

data/lib/bushido/app.rb

@@ -1,97 +1,102 @@
 module Bushido
   class App
     class << self
-      def create(url)
-        Bushido::User.load_account
+      def app_url
+        "#{Bushido::Platform.host}/apps/#{Bushido::Platform.app}.json"
+      end
 
-        puts "Creating from #{url} for #{Bushido::User.email}..."
 
-        post({:app => {:url => url}})
+      def get(params={})
+        Bushido::Command.get_command(app_url, params)
       end
 
-      def list
-        response = Bushido::Command.get_command("#{Temple}/apps")
 
-        response.each do |app|
-          puts app["app"]['subdomain']
-        end
-      end
+      def put(command, params={})
+        params[:command] = command
 
-      def open(name)
-        location = "http://#{name}.#{Bushido::Temple.gsub('http://','')}"
-        puts "Opening \"#{location}\" ..."
-        exec "open #{location}"
+        Bushido::Command.put_command(app_url, params)
       end
 
-      def get(name, params={})
-        url = "#{Temple}/apps/#{name}"
-        Bushido::Command.get_command(url, params)
+
+      def show
+        result = get
       end
 
-      def put(app, command, params={})
-        url = "#{Temple}/apps/#{app}.json"
-        params[:command] = command
 
-        Bushido::Command.show_response Bushido::Command.put_command(url, params)
+      def start
+        put :start
       end
 
-      def post(params)
-        url = "#{Temple}/apps"
-        Bushido::Command.show_response Bushido::Command.post_command(url, params)
+
+      def stop
+        put :stop
       end
 
-      def show(name)
-        result = get name
-        puts result.inspect
+
+      def restart
+        put :restart
       end
 
-      def start(name)
-        put name, :start
+
+      def claim
+        put :claim
       end
 
-      def stop(name)
-        put name, :stop
+
+      def update
+        put :update
       end
 
-      def restart(name)
-        put name, :restart
+
+      def add_var(key, value)
+        put :add_var, {:key => key, :value => value}
       end
 
-      def claim(name)
-        put name, :claim
+
+      def remove_var(key)
+        put :remove_var, {:key => key}
       end
 
-      def update(name)
-        put name, :update
+
+      def domains
+        get()["app"]["domains"]
       end
 
-      def add_var(name, key, value)
-        puts put(name, :add_var, {:key => key, :value => value})
+
+      def subdomain
+        get()["app"]["subdomain"]
       end
 
-      def remove_var(name, key)
-        puts put(name, :remove_var, {:key => key})
+
+      def set_subdomain(subdomain)
+        put :set_subdomain, {:subdomain => subdomain}
       end
 
-      def add_domain(name, domain)
-        puts put(name, :add_domain, {:domain => domain})
+
+      def add_domain(domain)
+        put :add_domain, {:domain => domain}
       end
 
-      def remove_domain(name)
-        puts put(name, :remove_domain)
+
+      def remove_domain(domain)
+        put :remove_domain, {:domain => domain}
       end
 
-      def clear_logs(name)
-        puts put(name, :clear_logs)
+
+      def clear_logs
+        put :clear_logs
       end
 
-      def logs(name)
-        puts get(name, {:gift => "logs"})
+
+      def logs
+        get({:gift => "logs"})
       end
 
-      def ssh_key(name)
-        puts get(name, {:gift => "ssh_key"})["ssh_key"]
+
+      def ssh_key
+        get({:gift => "ssh_key"})["ssh_key"]
       end
     end
   end
 end
+

data/lib/bushido/command.rb

@@ -1,34 +1,42 @@
 module Bushido
   class Command
+    @@last_request  = nil
+    @@request_count = 0
+
     class << self
+      def request_count
+        @@request_count
+      end
+
       def get_command(url, params={})
-        params.merge!({:auth_token => Bushido::User.authentication_token}) if params[:auth_token].nil? unless Bushido::User.authentication_token.nil?
+        @@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})
-        response = JSON.parse raw    
+        @@last_request = JSON.parse raw
       end
 
       def post_command(url, params)
-        params.merge!({:auth_token => Bushido::User.authentication_token}) if params[:auth_token].nil? unless Bushido::User.authentication_token.nil?
+        @@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)
-        response = JSON.parse raw    
+        @@last_request = JSON.parse raw    
       end
 
       def put_command(url, params, meta={})
+        @@request_count += 1
         if meta[:force]
-          params.merge!({:auth_token => Bushido::User.authentication_token}) if params[:auth_token].nil? unless Bushido::User.authentication_token.nil?
+          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)
-          response = JSON.parse raw
+          @@last_request = 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?
+          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)
-            response = JSON.parse raw
-          end
+          raw = RestClient.put(url, params.to_json,  :content_type => :json)
+          @@last_request = JSON.parse raw
         end
       end
 
@@ -54,6 +62,14 @@ module Bushido
           end
         end
       end
+
+      def last_command_successful?
+        @@last_request.nil? or @@last_request["errors"].nil?
+      end
+
+      def last_command_errored?
+        not last_command_successful?
+      end
     end
   end
 end

data/lib/bushido/platform.rb

@@ -0,0 +1,19 @@
+module Bushido
+  class Platform
+    class << self
+      def app
+        ENV['BUSHIDO_APP']
+      end
+
+
+      def key
+        ENV['BUSHIDO_APP_KEY']
+      end
+
+
+      def host
+        "http://#{ENV['BUSHIDO_HOST'] || 'bushi.do'}"
+      end
+    end
+  end
+end

data/lib/bushido/utils.rb

@@ -1,18 +1,6 @@
 module Bushido
   class Utils
     class << self
-      def while_authorized(&block)
-        if Bushido::User.authentication_token.nil? or Bushido::User.email.nil?
-          puts "Please authorized before attempting that command. You can run `bushido reauth` to update your credentials."
-          exit 1
-        else
-          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.9"
+  VERSION = "0.0.10"
 end

data/lib/bushido.rb

@@ -5,11 +5,8 @@ module Bushido
   require 'json'
   require 'highline/import'
 
-  require "bushido/user"
+  require "bushido/platform"
   require "bushido/utils"
   require "bushido/command"
   require "bushido/app"
-
-  host = ENV["HOST"] || "bushi.do"
-  Temple = "http://#{host}/"
 end

data/test/test_executable.rb

@@ -0,0 +1,10 @@
+require 'test/unit'
+
+class TestExecutable < Test::Unit::TestCase
+  EXECUTABLE = 
+  def test_complains_with_no_args
+    output = %x{#{File.expand_path('../../bin/bushido', __FILE__)}}
+    assert output =~ /See bushido -h for more detailed instructions/
+  end
+end
+

metadata

@@ -2,7 +2,7 @@
 name: bushido
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Sean Grove
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-21 00:00:00 -08:00
+date: 2011-03-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,6 +56,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gitignore
 - Gemfile
 - Rakefile
 - bin/bushido
@@ -63,9 +64,10 @@ files:
 - lib/bushido.rb
 - lib/bushido/app.rb
 - lib/bushido/command.rb
-- lib/bushido/user.rb
+- lib/bushido/platform.rb
 - lib/bushido/utils.rb
 - lib/bushido/version.rb
+- test/test_executable.rb
 has_rdoc: true
 homepage: http://gem.bushi.do
 licenses: []
@@ -94,5 +96,5 @@ rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Command-lin interface for bushi.do
-test_files: []
-
+test_files: 
+- test/test_executable.rb

data/lib/bushido/user.rb

@@ -1,111 +0,0 @@
-module Bushido
-  class User
-    class << self
-      def account
-        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::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::Utils.home_directory}/.bushido/config.json"), 'r') { |l| l.read })
-        rescue Errno::ENOENT
-          @account = retrieve_account("Couldn't find your Bushido config on this machine.")
-        end
-      end
-
-      def reauth
-        retrieve_account("Re-authenticating your account.")
-      end
-
-      def update_account(account)
-        print "Storing account information..."
-        Dir.mkdir "#{Bushido::Utils.home_directory}/.bushido" unless (File.exist?("#{Bushido::Utils.home_directory}/.bushido") and File.directory?("#{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(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
-        puts "Please wait while we look up the account information..."
-
-        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"]})
-          return {:email => credentials[:email], :authentication_token => result["authentication_token"]}
-        else
-          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] "
-            if $stdin.gets.chomp == "y"
-              self.create_account(credentials)
-            else
-              exit 1
-            end
-          end
-        end
-      end
-
-      def create_account(credentials)
-        # GET instead of POST because of AuthenticityToken issues. Deal with it later.
-        result = Bushido::Command.post_command "#{Bushido::Temple}/users/create.json", {:email => credentials[:email], :password => credentials[:password]}
-
-        Bushido::Command.show_response result
-
-        if result["errors"].nil?
-          update_account result
-          return credentials
-        else
-          exit 1
-        end
-      end
-
-      def show_api_key
-        puts "#{account['authentication_token']}"
-      end
-
-      def authentication_token
-        account["authentication_token"]
-      end
-
-      def email
-        account["email"]
-      end
-
-      def prompt_for_credentials(confirm=false)
-        result = {
-          :email => self.prompt_for_email,
-          :password => self.prompt_for_password
-        }
-
-        result.merge!({:password_confirmation => self.prompt_for_password(" Confirm: ")}) if confirm
-
-        return result
-      end
-
-      def prompt_for_email
-        print " Email: "
-        email = $stdin.gets.chomp
-      end
-
-      def prompt_for_password(prompt=" Password:")
-        ask(prompt) { |q| q.echo = false }
-      end
-    end
-  end
-end