codebase 3.1.1 → 3.1.2

data/lib/codebase/command.rb

@@ -1,6 +1,7 @@
 require 'codebase/commands/launchers'
 require 'codebase/commands/branches'
 require 'codebase/commands/setup'
+require 'codebase/commands/deployments'
 
 module Codebase
   class Command
@@ -8,6 +9,7 @@ module Codebase
     include Codebase::Commands::Launchers
     include Codebase::Commands::Branches
     include Codebase::Commands::Setup
+    include Codebase::Commands::Deployments
      
     attr_reader :directory, :args
     
@@ -43,5 +45,35 @@ module Codebase
       end
     end
     
+    def git_config_variable(name)
+      r = `git config --global codebase.#{name.to_s}`.chomp
+      r.empty? ? nil : r
+    end
+    
+    def api_request(url, username, password, data = nil)
+      require 'uri'
+      require 'net/http'
+      require 'net/https'
+      uri = URI.parse(url)
+      if data
+        req = Net::HTTP::Post.new(uri.path)
+      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")
+      res = Net::HTTP.new(uri.host, uri.port)
+      res = res.request(req, data)
+      case res
+      when Net::HTTPSuccess
+        return res.body
+      else
+        puts res.body
+        return false
+      end
+    end
+    
   end
 end

data/lib/codebase/commands/deployments.rb

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

@@ -29,9 +29,9 @@ module Codebase
           password  = ask_for_password('Password: ')
         
           ## Get the API key and save it...
-          user_properties_xml = api_request("http://#{domain}/users/#{username}", username, password)
-          if user_properties_xml && user_properties_xml.match(/\<api-key\>(\w{40})\<\/api-key>/)
-            api_key = $1
+          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}")
@@ -68,11 +68,6 @@ module Codebase
       
       private
       
-      def git_config_variable(name)
-        r = `git config --global codebase.#{name.to_s}`.chomp
-        r.empty? ? nil : r
-      end
-      
       def ask_with_validation(question, regex)
         ask(question) { |q| q.validate = regex }
       end
@@ -85,31 +80,6 @@ module Codebase
         password
       end
       
-      def api_request(url, username, password, data = nil)
-        require 'uri'
-        require 'net/http'
-        require 'net/https'
-        uri = URI.parse(url)
-        if data
-          req = Net::HTTP::Post.new(uri.path)
-        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")
-        res = Net::HTTP.new(uri.host, uri.port)
-        res = res.request(req, data)
-        case res
-        when Net::HTTPSuccess
-          return res.body
-        else
-          puts res.body
-          return false
-        end
-      end
-      
       def machine_hostname
         require 'socket'
         Socket.gethostname

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: codebase
 version: !ruby/object:Gem::Version 
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors: 
 - Adam Cooke
@@ -36,6 +36,7 @@ files:
 - bin/codebase
 - lib/codebase/command.rb
 - lib/codebase/commands/branches.rb
+- lib/codebase/commands/deployments.rb
 - lib/codebase/commands/launchers.rb
 - lib/codebase/commands/setup.rb
 - lib/codebase/directory.rb