codebase 4.0.9 → 4.0.10

data/lib/codebase.rb

@@ -14,7 +14,7 @@ module Codebase
   class NotConfiguredError < StandardError; end
   class MustBeInRepositoryError < StandardError; end
   
-  VERSION = "4.0.9"
+  VERSION = "4.0.10"
   
   def run(command, args = [])
     load_commands

data/lib/codebase/recipes.rb

@@ -13,23 +13,23 @@ Capistrano::Configuration.instance(:must_exist).load do
     git_config_variable(:username).match(/(.+)\/(.+)/)
   end
 
-  def domain
-    @domain ||= new_username? ? "#{new_username?[1]}.codebasehq.com" : git_config_variable(:domain)
+  def codebase_domain
+    @codebase_domain ||= new_username? ? "#{new_username?[1]}.codebasehq.com" : git_config_variable(:domain)
   end
 
-  def username
-    @username ||= new_username? ? new_username?[2] : git_config_variable(:username)
+  def codebase_username
+    @codebase_username ||= new_username? ? new_username?[2] : git_config_variable(:username)
   end
 
-  def api_username
-    @api_username = "#{domain.split('.').first}/#{username}"
+  def codebase_api_username
+    @codebase_api_username = "#{codebase_domain.split('.').first}/#{codebase_username}"
   end
 
-  def api_key
-    @api_key ||= git_config_variable(:apikey)
+  def codebase_api_key
+    @codebase_api_key ||= git_config_variable(:apikey)
   end
   
-  def api_request(url, data)
+  def codebase_api_request(url, data)
     require 'net/http'
     require 'net/https'
     require 'uri'
@@ -39,7 +39,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     uri = URI.parse(url)
     
     req = Net::HTTP::Post.new(uri.path)
-    req.basic_auth(api_username, api_key)
+    req.basic_auth(codebase_api_username, codebase_api_key)
     req.add_field('Content-type', 'application/xml')
     req.add_field('Accept', 'application/xml')
     
@@ -55,7 +55,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     when Net::HTTPFound
       if res.body =~ /http:\/\/api3.codebasehq.com/ && url.include?('https://')
         puts "      -  Status.......: Falling back to non SSL"
-        api_request(url.gsub("https://", "http://"), data)
+        codebase_api_request(url.gsub("https://", "http://"), data)
       end
     else 
       puts "  * \e[31mSorry, your deployment was not logged in Codebase - please check your config above.\e[0m"
@@ -82,7 +82,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     desc 'Log a deployment in Codebase'
     task :deploy do
 
-      if api_username == '' || api_key == ''
+      if codebase_api_username == '' || codebase_api_key == ''
         puts "  * Codebase is not configured on your computer. Run 'codebase setup' to auto configure it."
         puts "  * Deployments will not be tracked."
         next
@@ -103,8 +103,8 @@ Capistrano::Configuration.instance(:must_exist).load do
         
         puts "  * \e[44;33mAdding Deployment to your CodebaseHQ account\e[0m"
         puts "      -  Account......: #{url}"
-        puts "      -  Username.....: #{api_username}"
-        puts "      -  API Key......: #{api_key[0,10]}..."
+        puts "      -  Username.....: #{codebase_api_username}"
+        puts "      -  API Key......: #{codebase_api_key[0,10]}..."
         
         puts "      -  Project......: #{project}"
         puts "      -  Repository...: #{repository}"
@@ -141,7 +141,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         # http://api3.codebasehq.com/PROJECTNAME/REPO/deployments 
 
         real_url = "https://api3.codebasehq.com/#{project}/#{repository}/deployments"
-        api_request(real_url, xml.join)
+        codebase_api_request(real_url, xml.join)
         
       end
     end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: codebase
 version: !ruby/object:Gem::Version 
+  hash: 43
   prerelease: 
-  version: 4.0.9
+  segments: 
+  - 4
+  - 0
+  - 10
+  version: 4.0.10
 platform: ruby
 authors: 
 - Adam Cooke
@@ -10,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 +01:00
-default_executable: 
+date: 2011-05-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: highline
@@ -21,6 +25,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 5
+        - 0
         version: 1.5.0
   type: :runtime
   version_requirements: *id001
@@ -32,6 +41,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 1
+        - 5
         version: 1.1.5
   type: :runtime
   version_requirements: *id002
@@ -43,6 +57,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 2
+        - 7
         version: 0.2.7
   type: :runtime
   version_requirements: *id003
@@ -65,7 +84,6 @@ files:
 - lib/commands/clone.rb
 - lib/commands/keys.rb
 - lib/commands/setup.rb
-has_rdoc: true
 homepage: http://www.codebasehq.com
 licenses: []
 
@@ -79,17 +97,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Gem companion for your Codebase account. Including interactive cloning, key management and more