hoopla_salesforce 0.0.2 → 0.0.3

data/lib/hoopla_salesforce/deployer.rb

@@ -1,6 +1,6 @@
 require 'base64'
 require 'savon'
-require 'pp'
+require 'hoopla_salesforce/text_reporter'
 
 Savon::Request.logger = Logger.new(STDOUT)
 Savon::Request.logger.level = Logger::WARN
@@ -45,7 +45,7 @@ module HooplaSalesforce
       @header = { "wsdl:SessionHeader" => { "wsdl:sessionId" => response[:session_id] } }
     end
 
-    def deploy(zipfile)
+    def deploy(zipfile, options)
       login
 
       data = Base64.encode64(File.read(zipfile))
@@ -53,9 +53,7 @@ module HooplaSalesforce
       response = metaclient.deploy do |soap, wsse|
         soap.header = header
         soap.body = { "wsdl:ZipFile" => data,
-                      "wsdl:DeployOptions" => {
-                         "wsdl:runAllTests" => true
-                      },
+                      "wsdl:DeployOptions" => options,
                       :order! => ['wsdl:ZipFile', 'wsdl:DeployOptions']
                     }
       end.to_hash[:deploy_response][:result]
@@ -73,10 +71,11 @@ module HooplaSalesforce
         soap.body = { "wsdl:asyncProcessId" => response[:id] }
       end.to_hash[:check_deploy_status_response][:result]
 
-      pp response
+      error_out unless TextReporter.new(response).report
+    end
 
-      puts response[:run_test_result][:code_coverage_warnings][:message] rescue nil
-      puts response[:messages].map{ |m| m[:problem] }.join("\n")
+    def error_out
+      raise "Deployment errors. See report for details."
     end
 
     def retrieve(request)

data/lib/hoopla_salesforce/rake/deploy_task.rb

@@ -45,7 +45,25 @@ module HooplaSalesforce
           make_resources
           make_zipfile
           require 'hoopla_salesforce/deployer'
-          HooplaSalesforce::Deployer.new(username, password, token, enterprise_wsdl, metadata_wsdl).deploy(deploy_file)
+          HooplaSalesforce::Deployer.new(username, password, token, enterprise_wsdl, metadata_wsdl).deploy(deploy_file, deploy_options)
+        end
+      end
+
+      def deploy_options
+        testNames = Dir["#{src}/classes/*.cls"].inject([]) do |names, f|
+          body = File.read(f)
+          if body =~ /(testMethod|@isTest)/ && match = body.match(/\bclass\s+(\w+)\s*\{\s*/)
+            names << match[1]
+          else
+            names
+          end
+        end
+
+        if testNames.empty?
+          { "wsdl:runAllTests" => true }
+        else
+          testNames.map! { |n| namespace.sub(/__$/, '.') + n } if namespace
+          { "wsdl:runTests" => testNames }
         end
       end
 

data/lib/hoopla_salesforce/text_reporter.rb

@@ -0,0 +1,107 @@
+require 'pp'
+
+module HooplaSalesforce
+  class TextReporter
+    attr_reader :result
+
+    def initialize(result)
+      @result = result
+    end
+
+    def green
+      "\e[32m"
+    end
+
+    def red
+      "\e[31m"
+    end
+
+    def end_color
+      "\e[0m"
+    end
+
+    def sanitize(data)
+      return data if data.is_a? Array
+      return [data] if data
+      []
+    end
+
+    def report
+      indent            = "  "
+      updated_files     = []
+      problems          = []
+      test_failures     = []
+      coverage_warnings = []
+
+      result[:messages].each do |message|
+        if message[:success]
+          status = " "
+          status = "U" if message[:changed]
+          status = "D" if message[:deleted]
+          status = "A" if message[:created]
+
+          updated_files << "#{green}#{indent}#{status} #{message[:file_name]}#{end_color}"
+        end 
+
+        if message[:problem]
+          problem = "#{red}#{indent}#{message[:file_name]}:#{message[:line_number]} (column #{message[:column_number]})\n" 
+          problem += "#{indent*2}#{message[:problem]}#{end_color}"
+          problems << problem
+        end
+      end
+
+      if ENV['FULL_OUTPUT']
+        pp result
+      else
+        puts "(Run with FULL_OUTPUT=true to show full deploy output)"
+      end
+
+      puts
+      puts "Updated files:"
+      puts updated_files.uniq.join("\n")
+      puts
+
+      puts "Test results:"
+      test_result = result[:run_test_result]
+      failures    = test_result[:num_failures].to_i
+      passes      = test_result[:num_tests_run].to_i - failures
+      print "#{indent}Passes: #{green}#{passes}#{end_color} "
+      print "Failures: #{red}#{failures}#{end_color} "
+      puts  "Duration: #{test_result[:total_time]}"
+      puts
+
+      # :failures is only an array if we have more than 1. Fun...
+      sanitize(test_result[:failures]).each do |failure|
+        message = "#{indent}#{red}#{failure[:name]}.#{failure[:method_name]}: #{failure[:message]}\n"
+        message += failure[:stack_trace].split("\n").map{ |l| indent * 2 + l }.join("\n")
+        message += end_color
+        test_failures << message
+      end
+
+      if !test_failures.empty?
+        puts "Test failures:"
+        puts test_failures.join("\n")
+        puts
+      end
+
+      sanitize(test_result[:code_coverage_warnings]).each do |warning|
+        coverage_warnings << "#{indent}#{warning[:name]}: #{warning[:message]}"
+      end
+      
+      if !coverage_warnings.empty?
+        puts "Coverage warnings:"
+        puts coverage_warnings.join("\n")
+        puts
+      end
+
+      if !problems.empty?
+        puts "Problems:"
+        puts problems.join("\n")
+        puts
+      end
+
+      return problems.empty?
+    end
+  end
+end
+

data/lib/hoopla_salesforce/version.rb

@@ -1,3 +1,3 @@
 module HooplaSalesforce
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Trotter Cashion
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-05 00:00:00 -04:00
+date: 2010-08-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,7 @@ files:
 - lib/hoopla_salesforce/rake/deploy_task.rb
 - lib/hoopla_salesforce/rake/retrieve_task.rb
 - lib/hoopla_salesforce/version.rb
+- lib/hoopla_salesforce/text_reporter.rb
 - lib/hoopla_salesforce/deployer.rb
 - lib/hoopla_salesforce.rb
 has_rdoc: true