Merge remote-tracking branch 'origin/master'

Gemfile

@@ -1,32 +1,9 @@
 source :rubygems
 
-# external ruby libraries
-gem "json"
-gem "antlr3"
-gem "hashie"
-gem "uuidtools", ">=2.1.3"
-gem "nokogiri"
-gem "builder"
-gem "activesupport"
-gem "rake"
-gem "httparty"
-gem "highline"
-gem "i18n"
-gem "amqp"
+gemspec
 
-# development related gems
-group :development do
-  gem "rspec"
-  gem "simplecov"
-  gem "yard"
-  gem "yard-sinatra"
-  gem "yard-rspec"
-  gem "yard-cucumber"
-  gem "rspec-http"
-  gem "vcr"
-  gem "webmock", "=1.8.11"
-end
+gem 'vcr', :git => 'git://github.com/arax/vcr.git', :branch => 'test_framework_patches'
 
 platforms :jruby do
-  gem 'jruby-openssl'
+  gem 'jruby-openssl' if ((defined? JRUBY_VERSION) && (JRUBY_VERSION.split('.')[1].to_i < 7))
 end

Gemfile.lock

@@ -1,22 +1,43 @@
+GIT
+  remote: git://github.com/arax/vcr.git
+  revision: e82e843ceddd8822acea59846b015bcabf1906df
+  branch: test_framework_patches
+  specs:
+    vcr (2.4.0)
+
+PATH
+  remote: .
+  specs:
+    occi (3.0.0.beta.1)
+      activesupport
+      amqp
+      antlr3
+      hashie
+      highline
+      httparty
+      i18n
+      json
+      nokogiri
+      uuidtools (>= 2.1.3)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.9)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.3.2)
-    amq-client (0.9.5)
+    amq-client (0.9.10)
       amq-protocol (>= 0.9.4)
       eventmachine
-    amq-protocol (0.9.5)
+    amq-protocol (1.0.1)
     amqp (0.9.8)
       amq-client (~> 0.9.5)
       amq-protocol (>= 0.9.4)
       eventmachine
     antlr3 (1.8.12)
-    bouncy-castle-java (1.5.0146.1)
     builder (3.1.4)
-    crack (0.3.1)
+    crack (0.3.2)
     cucumber (1.2.1)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -35,32 +56,29 @@ GEM
       multi_json (~> 1.0)
       multi_xml
     i18n (0.6.1)
-    jruby-openssl (0.7.7)
-      bouncy-castle-java (>= 1.5.0146.1)
-    json (1.7.5)
-    json (1.7.5-java)
-    multi_json (1.3.7)
+    json (1.7.6)
+    json (1.7.6-java)
+    multi_json (1.5.0)
     multi_xml (0.5.1)
-    nokogiri (1.5.5)
-    nokogiri (1.5.5-java)
-    rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
+    nokogiri (1.5.6)
+    nokogiri (1.5.6-java)
+    rake (10.0.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-http (0.10.0)
       rspec (~> 2.0)
-    rspec-mocks (2.11.3)
+    rspec-mocks (2.12.1)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     uuidtools (2.1.3)
-    vcr (2.3.0)
-    webmock (1.8.11)
+    webmock (1.9.0)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
     yard (0.8.3)
@@ -78,24 +96,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
-  amqp
-  antlr3
   builder
-  hashie
-  highline
-  httparty
-  i18n
-  jruby-openssl
-  json
-  nokogiri
+  occi!
   rake
   rspec
   rspec-http
   simplecov
-  uuidtools (>= 2.1.3)
-  vcr
-  webmock (= 1.8.11)
+  vcr!
+  webmock
   yard
   yard-cucumber
   yard-rspec

README.md

@@ -17,12 +17,15 @@ The following setup is recommended
 Installation
 ------------
 To install the most recent stable version
+
     gem install occi
 
 To install the most recent beta version
+
     gem install occi --pre
 
 To build and install the bleeding edge version from master
+
     git clone git://github.com/gwdg/rOCCI.git
     cd rOCCI
     rake install

ext/mkrf_conf.rb

@@ -0,0 +1,25 @@
+require 'rubygems'
+require 'rubygems/command.rb'
+require 'rubygems/dependency_installer.rb' 
+
+begin
+  Gem::Command.build_args = ARGV
+rescue NoMethodError
+  # do nothing
+end 
+
+if defined? RUBY_PLATFORM && RUBY_PLATFORM == "java"
+  inst = Gem::DependencyInstaller.new
+
+  begin
+    inst.install "jruby-openssl" if ((defined? JRUBY_VERSION) && (JRUBY_VERSION.split('.')[1].to_i < 7))
+  rescue
+    # installation failed
+    exit(1)
+  end
+end
+
+# create dummy rakefile to indicate success
+f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w")
+f.write "task :default\n"
+f.close