codebase 4.0.8 → 4.0.9

data/lib/codebase.rb

@@ -14,7 +14,7 @@ module Codebase
   class NotConfiguredError < StandardError; end
   class MustBeInRepositoryError < StandardError; end
   
-  VERSION = "4.0.8"
+  VERSION = "4.0.9"
   
   def run(command, args = [])
     load_commands
@@ -100,7 +100,7 @@ Codebase.command "help" do |command|
       puts "    #{key.ljust(15)} #{command[:description].first}"
     end
     puts
-    puts "For more information see http://docs.codebasehq.com/gem"
+    puts "For more information see http://docs.atechmedia.com/codebase/gem"
     puts "See 'cb help [command]' for usage information."
   else
     if c = Codebase.commands[command]

data/lib/codebase/command.rb

@@ -115,6 +115,11 @@ module Codebase
       case res
       when Net::HTTPSuccess
         return res.body
+      when Net::HTTPFound
+        if res.body =~ /http:\/\/api3.codebasehq.com/ && url.include?('https://')
+          puts "Falling back to non SSL"
+          api_request(url.gsub("https://", "http://"), username, password)
+        end
       when Net::HTTPServiceUnavailable
         puts "The API is currently unavailable. Please check your codebase account has been enabled for API access."
         Process.exit(1)

data/lib/codebase/recipes.rb

@@ -1,4 +1,66 @@
 Capistrano::Configuration.instance(:must_exist).load do
+
+  def git_config_variable(name)
+    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
+
+  def new_username?
+    git_config_variable(:username).match(/(.+)\/(.+)/)
+  end
+
+  def domain
+    @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)
+  end
+
+  def api_username
+    @api_username = "#{domain.split('.').first}/#{username}"
+  end
+
+  def api_key
+    @api_key ||= git_config_variable(:apikey)
+  end
+  
+  def api_request(url, data)
+    require 'net/http'
+    require 'net/https'
+    require 'uri'
+    
+    puts "      -  URL..........: #{url}"
+    
+    uri = URI.parse(url)
+    
+    req = Net::HTTP::Post.new(uri.path)
+    req.basic_auth(api_username, api_key)
+    req.add_field('Content-type', 'application/xml')
+    req.add_field('Accept', 'application/xml')
+    
+    res = Net::HTTP.new(uri.host, uri.port)
+    if url.include?('https://')
+      res.use_ssl = true
+      res.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
+    res = res.request(req, data)
+    
+    case res
+    when Net::HTTPCreated then puts "  * \e[32mAdded deployment to Codebase\e[0m"
+    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)
+      end
+    else 
+      puts "  * \e[31mSorry, your deployment was not logged in Codebase - please check your config above.\e[0m"
+    end
+  end
   
   after "deploy:symlink", 'codebase:deploy'
   
@@ -19,10 +81,8 @@ Capistrano::Configuration.instance(:must_exist).load do
     
     desc 'Log a deployment in Codebase'
     task :deploy do
-      username = `git config codebase.username`.chomp.strip
-      api_key  = `git config codebase.apikey`.chomp.strip
-      
-      if username == '' || api_key == ''
+
+      if api_username == '' || api_key == ''
         puts "  * Codebase is not configured on your computer. Run 'codebase setup' to auto configure it."
         puts "  * Deployments will not be tracked."
         next
@@ -36,9 +96,14 @@ Capistrano::Configuration.instance(:must_exist).load do
         project = m[3]
         repository = m[4]
         
+        unless respond_to?(:branch)
+          branch = 'HEAD'
+        end
+          
+        
         puts "  * \e[44;33mAdding Deployment to your CodebaseHQ account\e[0m"
         puts "      -  Account......: #{url}"
-        puts "      -  Username.....: #{username}"
+        puts "      -  Username.....: #{api_username}"
         puts "      -  API Key......: #{api_key[0,10]}..."
         
         puts "      -  Project......: #{project}"
@@ -71,28 +136,13 @@ Capistrano::Configuration.instance(:must_exist).load do
         xml << "<environment>#{environment_to_send}</environment>"
         xml << "<branch>#{branch}</branch>"
         xml << "</deployment>"
-        
-        require 'net/http'
-        require 'uri'
-        
+
         # URL should be in this format to be compatible with the new API
         # http://api3.codebasehq.com/PROJECTNAME/REPO/deployments 
+
+        real_url = "https://api3.codebasehq.com/#{project}/#{repository}/deployments"
+        api_request(real_url, xml.join)
         
-        real_url = "http://api3.codebasehq.com/#{project}/#{repository}/deployments"
-        puts "      -  URL..........: #{real_url}"
-        
-        url = URI.parse(real_url)
-        
-        req = Net::HTTP::Post.new(url.path)
-        req.basic_auth(username, api_key)
-        req.add_field('Content-type', 'application/xml')
-        req.add_field('Accept', 'application/xml')
-        res = Net::HTTP.new(url.host, url.port).start { |http| http.request(req, xml.join) }
-        case res
-        when Net::HTTPCreated then puts "  * \e[32mAdded deployment to Codebase\e[0m"
-        else 
-          puts "  * \e[31mSorry, your deployment was not logged in Codebase - please check your config above.\e[0m"
-        end
       end
     end
     

metadata

@@ -2,7 +2,7 @@
 name: codebase
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 4.0.8
+  version: 4.0.9
 platform: ruby
 authors: 
 - Adam Cooke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 +01:00
+date: 2011-05-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency