codebase 3.1.5 → 3.2.0

data/lib/codebase.rb

@@ -1,28 +1,44 @@
 $:.unshift File.dirname(__FILE__)
 
+require 'rubygems'
+require 'json'
+require 'highline/import'
+HighLine.track_eof = false
+
 require 'codebase/command'
-require 'codebase/directory'
 
 module Codebase
-  
+    
   class Error < RuntimeError; end
+  class NotConfiguredError < StandardError; end
+  class MustBeInRepositoryError < StandardError; end
   
   extend self
     
   def run(args)
     begin
-      repository = Directory.new
       method = args.shift || 'default'
-      command = Codebase::Command.new(repository, args)
+      command = Codebase::Command.new
+      
       if command.respond_to?(method)
         command.send(method, *args)
       else
         $stderr.puts "Command Not Found - please check http://docs.codebasehq.com/gem for documentation."
+        Process.exit(1)
       end
+      
     rescue ArgumentError
       $stderr.puts "Invalid arguments provided to method. Check documentation."
+      Process.exit(1)
+    rescue Codebase::NotConfiguredError
+      puts "[Error] You have not configured the Codebase gem yet. Run 'cb setup' to run the setup tool."
+      Process.exit(1)
+    rescue Codebase::MustBeInRepositoryError
+      puts "[Error] You must be inside a Codebase repository to run this command."
+      Process.exit(1)
     rescue Codebase::Error => e
       $stderr.puts e.message
+      Process.exit(1)
     end
 
   end

data/lib/codebase/command.rb

@@ -1,37 +1,63 @@
-require 'codebase/commands/launchers'
-require 'codebase/commands/branches'
 require 'codebase/commands/setup'
-require 'codebase/commands/deployments'
 require 'codebase/commands/clone'
+require 'codebase/commands/branches'
+require 'codebase/commands/keys'
 
 module Codebase
   class Command
     
-    include Codebase::Commands::Launchers
-    include Codebase::Commands::Branches
     include Codebase::Commands::Setup
-    include Codebase::Commands::Deployments
     include Codebase::Commands::Clone
-     
-    attr_reader :directory, :args
+    include Codebase::Commands::Branches
+    include Codebase::Commands::Keys
     
-    def initialize(directory, args)
-      @directory, @args = directory, args
+    def default
+      puts "CodebaseHQ"
+      puts "See http://docs.codebasehq.com/gem for documentation"
+      if configured?
+        puts "-> System configured for #{username} at #{domain}"
+      else
+        puts "-> Not configured yet. Run 'cb setup' to configure your local computer."
+      end
     end
     
     private
-
-    def launch(*args)
-      begin
-        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 '[sudo] gem install launchy' a go."
+    
+    def configured?
+      domain && username && apikey
+    end
+    
+    def domain
+      @domain ||= git_config_variable(:domain)
+    end
+    
+    def username
+      @username ||= git_config_variable(:username)
+    end
+    
+    def apikey
+      @apikey ||= git_config_variable(:apikey)
+    end
+    
+    def in_repository?
+      repository_status != :false
+    end
+    
+    def repository_properties
+      return false unless in_repository?
+      origin_name = (git_config_variable(:remote) || 'origin')
+      remote_url  = git_config_variable("remote.#{origin_name}.url")
+      if remote_url =~ /git\@(gitbase|codebasehq|cbhqdev)\.com:(.*)\/(.*)\/(.*)\.git/
+        {:domain => $1, :account => $2, :project => $3, :repository => $4}
+      else
+        raise Codebase::Error, "Invalid Codebase repository (#{remote_url})"
       end
     end
     
+    def repository_status
+      @in_repository ||= (`git branch 2> /dev/null` && $?.success? ? true : :false) 
+    end
+    
     def execute_commands(array)
       for command in array
         puts "\e[44;33m" + command + "\e[0m"
@@ -48,7 +74,11 @@ module Codebase
     end
     
     def git_config_variable(name)
-      r = `git config --global codebase.#{name.to_s}`.chomp
+      if name.is_a?(Symbol)
+        r = `git config codebase.#{name.to_s}`.chomp
+      else
+        r = `git config #{name.to_s}`.chomp
+      end
       r.empty? ? nil : r
     end
     
@@ -62,10 +92,9 @@ module Codebase
       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")
+      req.add_field("Accept", "application/json")
+      req.add_field("Content-type", "application/json")
       res = Net::HTTP.new(uri.host, uri.port)
       if url.include?('https://')
         res.use_ssl = true
@@ -75,18 +104,19 @@ module Codebase
       case res
       when Net::HTTPSuccess
         return res.body
+      when Net::HTTPServiceUnavailable
+        puts "The API is currently unavailable. Please check your codebase account has been enabled for API access."
+        Process.exit(1)
       when Net::HTTPForbidden, Net::HTTPUnauthorized
         puts "Access Denied. Ensure you have correctly configured your local Gem installation using the 'cb setup' command."
         Process.exit(1)
       else
-        puts res.body
-        
         return false
       end
     end
     
     def api(path, data = nil)
-      api_request("http://#{directory.domain}/#{path}", git_config_variable(:username), git_config_variable(:apikey), data)
+      api_request("http://#{domain}/#{path}", git_config_variable(:username), git_config_variable(:apikey), data)
     end
     
   end

data/lib/codebase/commands/clone.rb

@@ -2,13 +2,15 @@ module Codebase
   module Commands
     module Clone
       
-      require 'xmlsimple'
-      require 'highline/import'
-      HighLine.track_eof = false
+      ## =========================================================================================================
+      ## Interactive Clone
+      ## =========================================================================================================
       
       def clone
-        projects = XmlSimple.xml_in(api('projects'))
-        projects = projects['project'].select{|p| p["status"].first == 'active'}
+        raise Codebase::NotConfiguredError unless configured?
+              
+        projects = JSON.parse(api('projects'))
+        projects = projects.select{|p| p["project"]["status"].first == 'active'}.map{|p| p['project']}
         
         ## Please somebody tell me there is a better way to do this using highline...
         project_hash = {}
@@ -17,28 +19,29 @@ module Codebase
           menu.prompt = "Please select a project: "
           count = 0
           for project in projects
-            project_hash[project['name'].first] = project['permalink'].first
-            menu.choice(project['name'].first)
+            project_hash[project['name']] = project['permalink']
+            menu.choice(project['name'])
           end
         end
         
         project = project_hash[project_id]
         
-        repositories = XmlSimple.xml_in(api("#{project}/repositories"))
-        repositories = repositories['repository']
+        repositories = JSON.parse(api("#{project}/repositories"))
+        repositories = repositories.map{|r| r['repository']}
         
         repos_hash = {}
         repo_id = choose do |menu|
           menu.select_by = :index
           menu.prompt = "Please select a repository:"
           for repository in repositories
-            repos_hash[repository['name'].first] = repository
-            menu.choice(repository['name'].first)
+            repos_hash[repository['name']] = repository
+            menu.choice(repository['name'])
           end
         end
         
-        repository = repos_hash[repo_id]['permalink'].first
-        clone_url  = repos_hash[repo_id]['clone-url'].first
+        repository = repos_hash[repo_id]['permalink']
+        clone_url  = repos_hash[repo_id]['clone_url']
+        scm        = repos_hash[repo_id]['scm']
         
         export_path = File.join(project, repository)
         folder = ask("Where would you like to clone this repository to? (default: #{export_path})")
@@ -47,7 +50,14 @@ module Codebase
         end
         
         system("mkdir -p #{export_path}")
-        exec("git clone #{clone_url} #{export_path}")
+        
+        case scm
+        when 'git' then exec("git clone #{clone_url} #{export_path}")
+        when 'hg'  then exec("hg clone ssh://#{clone_url} #{export_path}")
+        when 'svn' then exec("svn checkout #{clone_url} #{export_path}")
+        else
+          puts "Unsupported SCM."
+        end
       end
       
     end

data/lib/codebase/commands/keys.rb

@@ -0,0 +1,36 @@
+module Codebase
+  module Commands
+    module Keys
+      
+      ## =========================================================================================================
+      ## Keys
+      ## =========================================================================================================
+      
+      require 'hirb'
+      include Hirb::Console
+      
+      def keys
+        keys = api("users/#{username}/public_keys")
+        keys = JSON.parse(keys).map{|k| k['public_key_join']}
+        keys = keys.map{|k| {:description => k['description'], :key => k['key'][0, 50] + '...' }}
+        table keys, :fields => [:description, :key], :headers => {:description => 'Description', :key => 'Key'}
+      end
+      
+      def add_key(path = nil)
+        path = File.expand_path(".ssh/id_rsa.pub", "~") if path.nil?
+        unless File.exist?(path)
+          puts "Key file not found at '#{path}'"
+          Process.exit(1)
+        end
+        
+        data = {'public_key' => {'description' => "Key", 'key' => File.read(path)}}.to_json
+        if api("users/#{username}/public_keys", data)
+          puts "Successfully added key."
+        else
+          puts "An error occured while adding your key."
+        end
+      end
+
+    end
+  end
+end

data/lib/codebase/commands/setup.rb

@@ -1,47 +1,79 @@
 module Codebase
   module Commands
     module Setup
-      
-      require 'rubygems'
-      require 'highline/import'
+
+      ## =========================================================================================================
+      ## API Setup Tools
+      ## =========================================================================================================
       
       def setup
+        
+        ## We need git...
+        unless `which git` && $?.success?
+          puts "To use the Codebase gem you must have Git installed on your local computer. Git is used to store"
+          puts "important configuration variables which allow the gem to function."
+          Process.exit(1)
+        end
+        
         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 so you can use many of the gem functions."  
         puts
         
-        ## Is this configured?
-        if u = git_config_variable(:username)
-          puts "This system is already configured as \e[32m#{u}\e[0m."
-          puts "You can run 'cb unsetup' to clear settings."
-          return
-        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...
-          api_key = api_request("https://#{domain}/apikey", username, password)
-          if api_key
-            api_key = api_key.chomp
-            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"
+        ## Are you in a repository?
+        if in_repository?
+          puts "You are currently in a repository directory."
+          if agree("Would you like to only apply configuration to actions carried out from within this directory?")
+            global = ''
+            puts "OK, we'll add your API details to this repository only."
           else
-            puts "\e[37;41mAccess Denied. Please ensure you have entered your username & password correctly and try again.\e[0m"
-            return
+            global = '--global'
+            puts "OK, we'll configure your API details for your whole user account."
+          end
+        end
+        
+        ## Is this configured?
+        if configured? && !global.empty?
+          puts
+          puts "This system is already configured as \e[32m#{username}\e[0m."
+          unless agree("Do you wish to continue?")
+            Process.exit(0)
           end
         end
-                
+        
+        puts
+          
+        ## 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("Password:  ") { |q| q.echo = false }
+      
+        ## Get the API key and save it...
+        user_properties = api_request("https://#{domain}/profile", username, password)
+        
+        if user_properties
+          user = JSON.parse(user_properties)["user"]
+          system("git config #{global} codebase.username #{username}")
+          system("git config #{global} codebase.apikey #{user['api_key']}")
+          system("git config #{global} codebase.domain #{domain}")
+          system("git config #{global} user.name '#{user['first_name']} #{user['last_name']}'")
+          puts "Set user.name to '#{user['first_name']} #{user['last_name']}'"
+          system("git config #{global} user.email #{user['email_address']}")
+          puts "Set user.email to '#{user['email_address']}'"
+          puts "\e[32mConfigured Codebase API authentication properties successfully.\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
       
       def unsetup
-        system("git config --global --unset codebase.username")
-        system("git config --global --unset codebase.apikey")
-        system("git config --global --unset codebase.domain")
+        ['', '--global'].each do |type|
+          system("git config #{type} --unset codebase.username")
+          system("git config #{type} --unset codebase.apikey")
+          system("git config #{type} --unset codebase.domain")
+        end
         puts "System has been unsetup. API details have been removed from your configuration."
       end
       
@@ -51,14 +83,6 @@ module Codebase
         ask(question) { |q| q.validate = regex }
       end
       
-      def ask_for_password(question)
-        system("stty -echo")
-        password = ask(question)
-        system("stty echo")
-        puts
-        password
-      end
-            
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: codebase
 version: !ruby/object:Gem::Version 
-  version: 3.1.5
+  version: 3.2.0
 platform: ruby
 authors: 
 - Adam Cooke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-26 00:00:00 +00:00
+date: 2009-10-27 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,14 +23,14 @@ dependencies:
         version: 1.5.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: xml-simple
+  name: json
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.12
+        version: 1.1.5
     version: 
 description: 
 email: adam@atechmedia.com
@@ -47,10 +47,8 @@ files:
 - lib/codebase/command.rb
 - lib/codebase/commands/branches.rb
 - lib/codebase/commands/clone.rb
-- lib/codebase/commands/deployments.rb
-- lib/codebase/commands/launchers.rb
+- lib/codebase/commands/keys.rb
 - lib/codebase/commands/setup.rb
-- lib/codebase/directory.rb
 - lib/codebase/recipes.rb
 - lib/codebase.rb
 has_rdoc: true

data/lib/codebase/commands/deployments.rb

@@ -1,33 +0,0 @@
-module Codebase
-  module Commands
-    module Deployments
-      
-      def track_deploy(revision)
-        
-        unless directory.repository?
-          puts "This is not a valid Codebase repository. Ensure you are currently in the directory of the repository you wish to track."
-          return
-        end
-        
-        xml = []
-        xml << "<deployment>"
-        xml << "<servers>#{ENV['CBSERVERS']}</servers>"
-        xml << "<revision>#{revision}</revision>"
-        xml << "<environment>#{ENV['CBENVIRONMENT']}</environment>"
-        xml << "<branch>#{ENV['CBBRANCH']}</branch>"
-        xml << "</deployment>"
-        
-        username = git_config_variable(:username)
-        password = git_config_variable(:apikey)
-        
-        if api_request("http://#{directory.account}.codebasehq.com/#{directory.project}/#{directory.repository}/deployments", username, password, xml.join)
-          puts "\e[32mDeployment tracked successfully.\e[0m"
-        else
-          puts "\e[31mDeployment was not successfully tracked.\e[0m"
-        end
-
-      end
-      
-    end
-  end
-end

data/lib/codebase/commands/launchers.rb

@@ -1,70 +0,0 @@
-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/directory.rb

@@ -1,73 +0,0 @@
-module Codebase
-  
-  ## A directory represents the directory the user is currently within.
-  
-  class Directory
-    
-    attr_reader :permalink, :account    
-    
-    def initialize
-      get_properties
-    end
-    
-    def repository?
-      working_branch
-    end
-    
-    def working_branch
-      @working_branch ||= git(:status).split("\n").first.split(" ").last rescue nil
-    end
-    
-    def domain
-      if @account
-        "#{@account}.codebasehq.com"
-      else
-        git(:config, 'codebase.domain')
-      end
-    end
-    
-    def project
-      raise Codebase::Error, "This is not a valid Codebase repository" unless repository?
-      @project
-    end
-    
-    def repository
-      raise Codebase::Error, "This is not a valid Codebase repository" unless repository?
-      @repository
-    end
-    
-    def path
-      File.expand_path(File.dirname(__FILE__))
-    end
-
-    private
-    
-    def codebase_remote_name
-      configured = git(:config, 'codebase.remote')
-      if configured.empty?
-        'origin'
-      else
-        configured
-      end
-    end
-    
-    ## Returns the project an repository names base on the git remote URL
-    def get_properties
-      return unless repository?
-      remote_url = git(:config, "remote.#{codebase_remote_name}.url")
-      if m = remote_url.match(/git\@(gitbase|codebasehq)\.com:(.*)\/(.*)\/(.*)\.git/)
-        @account = m[2]
-        @project = m[3]
-        @repository = m[4]
-      else
-        raise Codebase::Error, "This is not a valid Codebase repository - #{remote_url} as '#{codebase_remote_name}'"
-      end
-    end
-    
-    def git(cmd, *args)
-      `git #{cmd} #{args.join(' ')} 2> /dev/null`.strip.chomp
-    end
-    
-    
-  end
-end