Merge pull request #8 from ehelms/master

Updates to run test suite on Travis.

.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - "1.8.7"
+  #- "1.9.2"
+  #- "1.9.3"
+# uncomment this line if your project needs to run something other than `rake`:
+script: bundle exec rake test:integration

Gemfile

@@ -3,13 +3,12 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in runcible.gemspec
 gemspec
 
-gem 'json'
+gem 'rake', '0.9.2.2'
+gem 'json', '1.7.5'
 gem 'rest-client', '>= 1.6.1'
 gem 'oauth'
-
-group :development, :test do
-  gem 'ruby-debug'
-end
+gem 'activesupport', '3.0.10'
+gem 'i18n', '0.5.0'
 
 group :test do
   gem 'vcr'

Rakefile

@@ -10,9 +10,10 @@ namespace :test do
   task :integration do
     options = {}
 
-    options[:mode]      = ENV['mode']
+    options[:mode]      = ENV['mode'] || 'none'
     options[:test_name] = ENV['test']
     options[:auth_type] = ENV['auth_type']
+    options[:logging]   = ENV['logging']
 
     if !['recorded', 'live', 'none'].include?(options[:mode])
       puts "Invalid test mode"

test/integration/resources/helpers/repository_helper.rb

@@ -61,7 +61,6 @@ def self.task
   end
 
   def self.create_and_sync_repo(options={})
-    puts "Creating and Sync'ing repository."
     create_repo(options)
     sync_repo(options)
   end
@@ -126,8 +125,6 @@ def self.create_schedule
   end
 
   def self.destroy_repo(id=@repo_id)
-    puts "Destroying Repository."
-
     VCR.use_cassette('pulp_repository_helper') do
       if @task
         while !(['finished', 'error', 'timed_out', 'canceled', 'reset'].include?(@task['state'])) do

test/integration/test_runner.rb

@@ -10,7 +10,6 @@
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
 
 require 'rubygems'
-require 'ruby-debug'
 require 'minitest/unit'
 require 'minitest/autorun'
 
@@ -57,10 +56,16 @@ def run_tests(options={})
     mode      = options[:mode] || "recorded" 
     test_name = options[:test_name] || nil
     auth_type = options[:auth_type] || "http"
+    logging   = options[:logging] || false
 
     MiniTest::Unit.runner = CustomMiniTestRunner::Unit.new
 
-    set_runcible_config(auth_type)
+    if mode == "live"
+      set_runcible_config({ :auth_type => auth_type, :logging => logging })
+    else
+      set_runcible_config({ :logging => logging })
+    end
+
     set_vcr_config(mode)
 
     if test_name
@@ -71,13 +76,17 @@ def run_tests(options={})
     end
   end
 
-  def set_runcible_config(auth_type)
-    if auth_type == "http"
-      Runcible::Base.config = {
-        :api_path   => "/pulp/api/v2/",
-        :http_auth  => {},
-        :logger     => 'stdout'
-      }
+  def set_runcible_config(options)
+    Runcible::Base.config = {
+      :api_path   => "/pulp/api/v2/",
+      :http_auth  => {}
+    }
+
+    if options[:logging] == "true"
+      Runcible::Base.config[:logger] = 'stdout'
+    end
+
+    if options[:auth_type] == "http"
 
       File.open('/etc/pulp/server.conf') do |f|
         f.each_line do |line|
@@ -90,11 +99,7 @@ def set_runcible_config(auth_type)
           end
         end
       end
-    elsif auth_type == "oauth"
-      Runcible::Base.config = {
-        :api_path => "/pulp/api/v2/",
-        :oauth => {}
-      }
+    elsif options[:auth_type] == "oauth"
 
       File.open('/etc/pulp/server.conf') do |f|
         f.each_line do |line|
@@ -109,6 +114,10 @@ def set_runcible_config(auth_type)
           end
         end
       end
+    else
+      Runcible::Base.config[:http_auth][:password] = 'admin'
+      Runcible::Base.config[:user]  = 'admin'
+      Runcible::Base.config[:url]   = "https://localhost"
     end
   end
 

test/unit/test_base.rb

@@ -24,7 +24,6 @@
 require 'rubygems'
 require 'minitest/autorun'
 require 'minitest/mock'
-require 'ruby-debug'
 require './lib/runcible/base'