codebase 4.0.2 → 4.0.3

data/lib/codebase/recipes.rb

@@ -1,74 +1,95 @@
 Capistrano::Configuration.instance(:must_exist).load do
   
-  after "deploy:symlink", :add_deployment_to_codebase
-
-  task :add_deployment_to_codebase do
-    
-    username = `git config codebase.username`.chomp.strip
-    api_key  = `git config codebase.apikey`.chomp.strip
-    
-    regex = /git\@(gitbase|codebasehq)\.com:(.*)\/(.*)\/(.*)\.git/
-    unless m = repository.match(regex)
-      puts "  * \e[31mYour repository URL does not a match a valid CodebaseHQ Clone URL\e[0m"
-    else
-      url = "#{m[2]}.codebasehq.com"
-      project = m[3]
-      repository = m[4]
-    
-      puts "  * \e[44;33mAdding Deployment to your CodebaseHQ account\e[0m"
-      puts "      -  Account......: #{url}"
-      puts "      -  Username.....: #{username}"
-      puts "      -  API Key......: #{api_key[0,10]}..."
+  after "deploy:symlink", 'codebase:deploy'
+  
+  namespace :codebase do
     
-      puts "      -  Project......: #{project}"
-      puts "      -  Repository...: #{repository}"
-          
-
-      environment_to_send = begin
-        if respond_to?(:environment)
-          env = environment.dup
-          env.gsub!(/\W+/, ' ')
-          env.strip!
-          env.downcase!
-          env.gsub!(/\ +/, '-')        
-          puts "      -  Environment..: #{env}" unless env.nil? || env.empty?
-          env
-        else
-          ''
-        end
+    desc "Open the Codebase comparison for the changes which are due to be deployed"
+    task :pending, :except => { :no_release => true } do
+      if match = repository.match(/git\@(codebasehq|gitbase)\.com\:([\w\-]+)\/([\w\-]+)\/([\w\-]+)\.git/)
+        from = source.next_revision(current_revision)
+        to   = `git ls-remote #{repository} #{branch}`.split(/\s+/).first
+        url  = "https://#{match[2]}.codebasehq.com/#{match[3]}/#{match[4]}/compare/#{from}..#{to}"
+        puts "Opening... #{url}"
+        system("open #{url}")
+      else
+        puts "! Repository does not match a valid Codebase Git URL."
       end
-
-      servers = roles.values.collect{|r| r.servers}.flatten.collect{|s| s.host}.uniq.join(', ') rescue ''
+    end
     
-      puts "      -  Servers......: #{servers}"
-      puts "      -  Revision.....: #{real_revision}"
-      puts "      -  Branch.......: #{branch}"
-
-      xml = []
-      xml << "<deployment>"
-      xml << "<servers>#{servers}</servers>"
-      xml << "<revision>#{real_revision}</revision>"
-      xml << "<environment>#{environment_to_send}</environment>"
-      xml << "<branch>#{branch}</branch>"
-      xml << "</deployment>"
-            
-      require 'net/http'
-      require 'uri'
-      
-      real_url = "http://#{url}/#{project}/#{repository}/deployments"
-      puts "      -  URL..........: #{real_url}"
+    desc 'Log a deployment in Codebase'
+    task :deploy do
+      username = `git config codebase.username`.chomp.strip
+      api_key  = `git config codebase.apikey`.chomp.strip
       
-      url = URI.parse(real_url)
+      if username == '' || apikey == ''
+        puts "  * Codebase is not configured on your computer. Run 'codebase setup' to auto configure it."
+        puts "  * Deployments will not be tracked."
+        next
+      end
       
-      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"
+      regex = /git\@(gitbase|codebasehq)\.com:(.*)\/(.*)\/(.*)\.git/
+      unless m = repository.match(regex)
+        puts "  * \e[31mYour repository URL does not a match a valid CodebaseHQ Clone URL\e[0m"
+      else
+        url = "#{m[2]}.codebasehq.com"
+        project = m[3]
+        repository = m[4]
+        
+        puts "  * \e[44;33mAdding Deployment to your CodebaseHQ account\e[0m"
+        puts "      -  Account......: #{url}"
+        puts "      -  Username.....: #{username}"
+        puts "      -  API Key......: #{api_key[0,10]}..."
+        
+        puts "      -  Project......: #{project}"
+        puts "      -  Repository...: #{repository}"
+        
+        environment_to_send = begin
+          if respond_to?(:environment)
+            env = environment.dup
+            env.gsub!(/\W+/, ' ')
+            env.strip!
+            env.downcase!
+            env.gsub!(/\ +/, '-')        
+            puts "      -  Environment..: #{env}" unless env.nil? || env.empty?
+            env
+          else
+            ''
+          end
+        end
+        
+        servers = roles.values.collect{|r| r.servers}.flatten.collect{|s| s.host}.uniq.join(', ') rescue ''
+        
+        puts "      -  Servers......: #{servers}"
+        puts "      -  Revision.....: #{real_revision}"
+        puts "      -  Branch.......: #{branch}"
+        
+        xml = []
+        xml << "<deployment>"
+        xml << "<servers>#{servers}</servers>"
+        xml << "<revision>#{real_revision}</revision>"
+        xml << "<environment>#{environment_to_send}</environment>"
+        xml << "<branch>#{branch}</branch>"
+        xml << "</deployment>"
+        
+        require 'net/http'
+        require 'uri'
+        
+        real_url = "http://#{url}/#{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

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: codebase
 version: !ruby/object:Gem::Version 
-  version: 4.0.2
+  hash: 57
+  prerelease: false
+  segments: 
+  - 4
+  - 0
+  - 3
+  version: 4.0.3
 platform: ruby
 authors: 
 - Adam Cooke
@@ -9,39 +15,57 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-04 00:00:00 +00:00
+date: 2010-09-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: highline
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 5
+        - 0
         version: 1.5.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 1
+        - 5
         version: 1.1.5
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: hirb
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 2
+        - 7
         version: 0.2.7
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: 
 email: adam@atechmedia.com
 executables: 
@@ -71,21 +95,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Gem companion for your Codebase account. Including interactive cloning, key management and more