codebase 4.0.5 → 4.0.6

data/lib/codebase.rb

@@ -14,7 +14,7 @@ module Codebase
   class NotConfiguredError < StandardError; end
   class MustBeInRepositoryError < StandardError; end
   
-  VERSION = "4.0.5"
+  VERSION = "4.0.6"
   
   def run(command, args = [])
     load_commands
@@ -118,7 +118,7 @@ Codebase.command "help" do |command|
         end
       end
     else
-      puts "Command Not Found. Check 'point help' for a full list of commands available to you."
+      puts "Command Not Found. Check 'cb help' for a full list of commands available to you."
     end
   end
 end

data/lib/codebase/command.rb

@@ -30,12 +30,20 @@ module Codebase
       domain && username && apikey
     end
     
+    def new_username?
+      git_config_variable(:username).match(/(.+)\/(.+)/)
+    end
+    
     def domain
-      @domain ||= git_config_variable(:domain)
+      @domain ||= new_username? ? "#{new_username?[1]}.codebasehq.com" : git_config_variable(:domain)
     end
     
     def username
-      @username ||= git_config_variable(:username)
+      @username ||= new_username? ? new_username?[2] : git_config_variable(:username)
+    end
+    
+    def api_username
+      @api_username = "#{domain.split('.').first}/#{username}"
     end
     
     def apikey
@@ -119,7 +127,7 @@ module Codebase
     end
     
     def api(path, data = nil)
-      api_request("http://#{domain}/#{path}", git_config_variable(:username), git_config_variable(:apikey), data)
+      api_request("http://api3.codebasehq.com/#{path}", api_username, apikey, data)
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: codebase
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: 
   segments: 
   - 4
   - 0
-  - 5
-  version: 4.0.5
+  - 6
+  version: 4.0.6
 platform: ruby
 authors: 
 - Adam Cooke
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 +01:00
-default_executable: 
+date: 2011-05-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: highline
@@ -85,7 +84,6 @@ files:
 - lib/commands/clone.rb
 - lib/commands/keys.rb
 - lib/commands/setup.rb
-has_rdoc: false
 homepage: http://www.codebasehq.com
 licenses: []
 
@@ -115,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Gem companion for your Codebase account. Including interactive cloning, key management and more