codebase 3.0.9 → 3.1.0

data/lib/codebase.rb

@@ -1,8 +1,7 @@
 $:.unshift File.dirname(__FILE__)
 
-require 'codebase_helpers/command_base'
-require 'codebase_helpers/command'
-require 'codebase_helpers/directory'
+require 'codebase/command'
+require 'codebase/directory'
 
 module Codebase
   
@@ -18,8 +17,10 @@ module Codebase
       if command.respond_to?(method)
         command.send(method, *args)
       else
-        $stderr.puts "Command Not Found - please check http://help.codebasehq.com for documentation."
+        $stderr.puts "Command Not Found - please check http://docs.codebasehq.com/gem for documentation."
       end
+    rescue ArgumentError
+      $stderr.puts "Invalid arguments provided to method. Check documentation."
     rescue Codebase::Error => e
       $stderr.puts e.message
     end

data/lib/{codebase_helpers/command_base.rb → codebase/command.rb}

@@ -1,6 +1,14 @@
+require 'codebase/commands/launchers'
+require 'codebase/commands/branches'
+require 'codebase/commands/setup'
+
 module Codebase
-  class CommandBase
-        
+  class Command
+    
+    include Codebase::Commands::Launchers
+    include Codebase::Commands::Branches
+    include Codebase::Commands::Setup
+     
     attr_reader :directory, :args
     
     def initialize(directory, args)
@@ -11,12 +19,12 @@ module Codebase
 
     def launch(*args)
       begin
-        gem 'launchy'
+        require 'rubygems'
         require 'launchy'
         url = "http://#{directory.domain}/" + args.join('/').gsub(/\?\z/, "")
         Launchy::Browser.new.visit(url)
       rescue Gem::LoadError
-        raise Codebase::Error, "Sorry, you need to install launchy to do that - give 'gem install launchy' a go."
+        raise Codebase::Error, "Sorry, you need to install launchy to do that - give '[sudo] gem install launchy' a go."
       end
     end
     

data/lib/codebase/commands/branches.rb

@@ -0,0 +1,27 @@
+module Codebase
+  module Commands
+    module Branches
+
+      ## =========================================================================================================
+      ## Remote Branch Management
+      ## =========================================================================================================
+
+      def mkbranch(branch_name, source_branch = 'master')
+        commands = []
+        commands << "git push origin #{source_branch}:refs/heads/#{branch_name}"
+        commands << "git fetch origin"
+        commands << "git branch --track #{branch_name} origin/#{branch_name}"
+        commands << "git checkout #{branch_name}"
+        execute_commands(commands)
+      end
+
+      def rmbranch(branch_name)
+        commands = []
+        commands << "git push origin :#{branch_name}"
+        commands << "git branch -d #{branch_name}"
+        execute_commands(commands)
+      end
+         
+    end
+  end
+end 

data/lib/codebase/commands/launchers.rb

@@ -0,0 +1,70 @@
+module Codebase
+  module Commands
+    module Launchers
+      
+      ## =========================================================================================================
+      ## Launchers
+      ## =========================================================================================================
+      
+      def default
+        if directory.repository?
+          launch directory.project
+        else
+          launch
+        end
+      end
+      alias_method :dashboard, :default
+      
+      def messages
+        launch 'messages'
+      end
+      alias_method :me, :messages
+
+      def tickets
+        launch directory.project, 'tickets'
+      end
+      alias_method :ti, :tickets
+
+      def new_ticket
+        launch directory.project, 'tickets', 'new'
+      end
+      alias_method :nti, :new_ticket
+
+      def milestones
+        launch directory.project, 'milestones'
+      end
+      alias_method :mi, :milestones
+
+      def time
+        launch directory.project, 'time'
+      end
+      alias_method :tm, :time
+
+      def wiki
+        launch directory.project, 'wiki'
+      end
+      alias_method :wi, :wiki
+
+      def browser
+        launch directory.project, directory.repository, 'tree', directory.working_branch
+      end
+      alias_method :br, :browser
+
+      def commits
+        launch directory.project, directory.repository, 'commits', directory.working_branch
+      end
+      alias_method :co, :commits
+
+      def deployments
+        launch directory.project, directory.repository, 'deployments'
+      end
+      alias_method :de, :deployments
+
+      def tasks
+        launch directory.project, directory.repository, 'tasks', directory.working_branch
+      end
+      alias_method :ta, :tasks
+      
+    end
+  end
+end

data/lib/codebase/commands/setup.rb

@@ -0,0 +1,122 @@
+module Codebase
+  module Commands
+    module Setup
+      
+      require 'rubygems'
+      require 'highline/import'
+      
+      def setup
+        puts "\e[33;44mWelcome to the CodebaseHQ Initial Setup Tool\e[0m"
+        puts "This tool will get your local computer configured to use your codebase account. It will automatically configure"
+        puts "the gem for API access as well as uploading your public key file to your Codebase user account."  
+        puts
+        
+        ## Is this configured?
+        if u = git_config_variable(:username)
+          puts "This system is already configured as \e[32m#{u}\e[0m."
+          domain    = git_config_variable(:domain)
+          username  = u
+          api_key   = git_config_variable(:apikey)
+          
+          unless agree("Are you sure you wish to continue with uploading your public keys?")
+            puts "OK, no problem."
+            return
+          end
+        else
+          ## Get some details
+          domain    = ask_with_validation("CodebaseHQ domain (e.g. widgetinc.codebasehq.com): ", /\A(\w+).(codebasehq|cbhqdev).(com|local)\z/)
+          username  = ask_with_validation("Username: ", /[\w\.]+/)
+          password  = ask_for_password('Password: ')
+        
+          ## Get the API key and save it...
+          user_properties_xml = api_request("http://#{domain}/users/#{username}", username, password)
+          if user_properties_xml && user_properties_xml.match(/\<api-key\>(\w{40})\<\/api-key>/)
+            api_key = $1
+            system("git config --global codebase.username #{username}")
+            system("git config --global codebase.apikey #{api_key}")
+            system("git config --global codebase.domain #{domain}")
+            puts "\e[32mConfigured Codebase API authentication properties.\e[0m"
+          else
+            puts "\e[37;41mAccess Denied. Please ensure you have entered your username & password correctly and try again.\e[0m"
+            return
+          end
+        end
+        
+        ## Send the user's public key to the server if they don't already have keys...
+        key_file = File.expand_path(File.join('~', '.ssh', 'id_rsa.pub'))
+        if File.exist?(key_file)
+          key = File.read(key_file)        
+          description = "Key from #{machine_hostname}"
+          if api_request("http://#{domain}/users/#{username}/public_keys", username, api_key, "<public-key><description>#{description}</description><key>#{key}</key></public-key>")
+            puts "\e[32mPublic key from #{key_file} uploaded to your Codebase account on #{domain}.\e[0m"
+          else
+            puts "\e[37;41mWe couldn't upload your public key at this file. Please try later and verify your API key is correct.\e[0m"
+          end
+          
+        else
+          puts "No key file found at #{key_file}. Nothing to upload to Codebase."
+        end
+        
+      end
+      
+      def unsetup
+        system("git config --global --unset codebase.username")
+        system("git config --global --unset codebase.apikey")
+        system("git config --global --unset codebase.domain")
+        puts "System has been unsetup. API details have been removed from your configuration."
+      end
+      
+      private
+      
+      def git_config_variable(name)
+        r = `git config --global codebase.#{name.to_s}`.chomp
+        r.empty? ? nil : r
+      end
+      
+      def ask_with_validation(question, regex)
+        ask(question) { |q| q.validate = regex }
+      end
+      
+      def ask_for_password(question)
+        system("stty -echo")
+        password = ask(question)
+        system("stty echo")
+        puts
+        password
+      end
+      
+      def api_request(url, username, password, data = nil)
+        require 'uri'
+        require 'net/http'
+        require 'net/https'
+        uri = URI.parse(url)
+        if data
+          req = Net::HTTP::Post.new(uri.path)
+        else
+          req = Net::HTTP::Get.new(uri.path)
+        end
+        
+        req.basic_auth(username, password)
+        req.add_field("Accept", "application/xml")
+        req.add_field("Content-type", "application/xml")
+        res = Net::HTTP.new(uri.host, uri.port)
+        res = res.request(req, data)
+        case res
+        when Net::HTTPSuccess
+          return res.body
+        else
+          puts res.body
+          return false
+        end
+      end
+      
+      def machine_hostname
+        require 'socket'
+        Socket.gethostname
+      rescue
+        "local computer"
+      end
+      
+    end
+  end
+end

data/lib/{codebase_helpers → codebase}/directory.rb

@@ -37,7 +37,7 @@ module Codebase
     end
     
     def path
-      File.dirname(__FILE__)
+      File.expand_path(File.dirname(__FILE__))
     end
 
     private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: codebase
 version: !ruby/object:Gem::Version 
-  version: 3.0.9
+  version: 3.1.0
 platform: ruby
 authors: 
 - Adam Cooke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-26 00:00:00 +01:00
+date: 2009-10-26 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -25,11 +25,13 @@ extra_rdoc_files: []
 files: 
 - bin/cb
 - bin/codebase
+- lib/codebase/command.rb
+- lib/codebase/commands/branches.rb
+- lib/codebase/commands/launchers.rb
+- lib/codebase/commands/setup.rb
+- lib/codebase/directory.rb
 - lib/codebase/recipes.rb
 - lib/codebase.rb
-- lib/codebase_helpers/command.rb
-- lib/codebase_helpers/command_base.rb
-- lib/codebase_helpers/directory.rb
 has_rdoc: true
 homepage: http://www.codebasehq.com
 licenses: []

data/lib/codebase_helpers/command.rb

@@ -1,124 +0,0 @@
-module Codebase
-  class Command < CommandBase
-
-    ## =========================================================================================================
-    ## Launchers
-    ## =========================================================================================================
-
-    def default
-      if directory.repository?
-        launch directory.project
-      else
-        launch
-      end
-    end
-    alias_method :dashboard, :default
-    
-    def messages
-      launch 'messages'
-    end
-    alias_method :me, :messages
-    
-    def tickets
-      launch directory.project, 'tickets'
-    end
-    alias_method :ti, :tickets
-    
-    def new_ticket
-      launch directory.project, 'tickets', 'new'
-    end
-    alias_method :nti, :new_ticket
-    
-    def milestones
-      launch directory.project, 'milestones'
-    end
-    alias_method :mi, :milestones
-    
-    def time
-      launch directory.project, 'time'
-    end
-    alias_method :tm, :time
-    
-    def wiki
-      launch directory.project, 'wiki'
-    end
-    alias_method :wi, :wiki
-    
-    def browser
-      launch directory.project, directory.repository, 'tree', directory.working_branch
-    end
-    alias_method :br, :browser
-    
-    def commits
-      launch directory.project, directory.repository, 'commits', directory.working_branch
-    end
-    alias_method :co, :commits
-    
-    def deployments
-      launch directory.project, directory.repository, 'deployments'
-    end
-    alias_method :de, :deployments
-    
-    def tasks
-      launch directory.project, directory.repository, 'tasks', directory.working_branch
-    end
-    alias_method :ta, :tasks
-    
-    ## =========================================================================================================
-    ## Remote Branch Management
-    ## =========================================================================================================
-    
-    def mkbranch(branch_name, source_branch = 'master')
-      commands = []
-      commands << "git push origin #{source_branch}:refs/heads/#{branch_name}"
-      commands << "git fetch origin"
-      commands << "git branch --track #{branch_name} origin/#{branch_name}"
-      commands << "git checkout #{branch_name}"
-      execute_commands(commands)
-    end
-    
-    def rmbranch(branch_name)
-      commands = []
-      commands << "git push origin :#{branch_name}"
-      commands << "git branch -d #{branch_name}"
-      execute_commands(commands)
-    end
-    
-    ## =========================================================================================================
-    ## Commit Logger
-    ## =========================================================================================================
-
-    def log(message)
-      current = directory.send(:git, :config, 'codebase.log').split("\\n")
-      current << message
-      directory.send(:git, :config, 'codebase.log', "\"#{current.join("\n")}\"")
-    end
-    
-    def showlog
-      output = directory.send(:git, :config, 'codebase.log').split("\n").map{|line| " * #{line}\n"}
-      if output.empty?
-        $stderr.puts "There is nothing in the Codebase Log at the moment. Add something using 'cb log \"My Message Here\"'"
-        Process.exit(1)
-      else
-        puts output
-      end
-    end
-    
-    def clearlog
-      directory.send(:git, :config, '--unset', 'codebase.log')
-      puts "Codebase log cleared."
-    end
-    
-    def commit(message = '')
-      output = directory.send(:git, :config, 'codebase.log').split("\n").map{|line| " * #{line}\n"}
-      if output.empty? || message.nil? || message == ''
-        $stderr.puts "You haven't added a message and/or added log entries. You may want to use a normal commit using 'git commit -m ...'"
-        Process.exit(1)
-      else
-        system("git commit -m '#{message}\n\n#{output}'")
-        clearlog
-      end
-    end
-    
-  end
-end