occi-cli 4.0.1 → 4.1.0

data/.travis.yml

@@ -1,10 +1,6 @@
 language: ruby
 
-before_install:
-  - sudo apt-get install -qq libonig-dev
-
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
   - ruby-head
@@ -21,10 +17,6 @@ matrix:
     - rvm: ruby-head
     - rvm: jruby-head
   exclude:
-    - rvm: 1.8.7
-      jdk: openjdk7
-    - rvm: 1.8.7
-      jdk: oraclejdk7
     - rvm: 1.9.3
       jdk: openjdk7
     - rvm: 1.9.3
@@ -41,3 +33,5 @@ matrix:
 branches:
   only:
     - master
+    - 4.0.x
+    - 4.1.x

data/Gemfile

@@ -6,11 +6,3 @@ group :development do
   gem 'warbler', :git => 'git://github.com/jruby/warbler.git', :ref => 'ce3ce4df137504822e4cbb9399dee7e7dd767c44'
   gem 'rubygems-tasks', :git => 'git://github.com/postmodern/rubygems-tasks.git'
 end
-
-platforms :jruby do
-  gem 'jruby-openssl' if ((defined? JRUBY_VERSION) && (JRUBY_VERSION.split('.')[1].to_i < 7))
-end
-
-platforms :ruby_18 do
-      gem 'oniguruma'
-end

data/README.md

@@ -10,25 +10,23 @@ Requirements
 ------------
 
 ### Ruby
-* at least version 1.8.7 is required
-* Ruby 1.9.3+ is recommended
-* RubyGems installed
-* rake installed (e.g., `gem install rake`)
+* Ruby 1.9.3 is required
+* RubyGems have to be installed
+* Rake has to be installed (e.g., `gem install rake`)
 
 ### Libraries/packages
 * libxslt1-dev/libxslt-devel
 * libxml2-dev/libxml2-devel
-* **only if using Ruby 1.8.7:** libonig-dev/oniguruma-devel (Linux) or oniguruma (Mac)
 
 ### Examples
 For distros based on Debian:
 ~~~
-apt-get install ruby rubygems ruby-dev libxslt1-dev libxml2-dev libonig-dev
+apt-get install ruby rubygems ruby-dev libxslt1-dev libxml2-dev
 ~~~
 
 For distros based on RHEL:
 ~~~
-yum install libxml2-devel libxslt-devel ruby-devel openssl-devel gcc gcc-c++ ruby rubygems oniguruma-devel
+yum install libxml2-devel libxslt-devel ruby-devel openssl-devel gcc gcc-c++ ruby rubygems
 ~~~
 
 To use rOCCI-cli with Java, you need JRE 6 or 7. To build rOCCI-cli for Java, you need JDK 6 or 7.
@@ -144,6 +142,11 @@ To delete a compute resource use
 Changelog
 ---------
 
+### Version 4.1
+* Dropped Ruby 1.8.x support
+* Dropped jRuby 1.6.x support
+* Updated dependencies
+
 ### Version 4.0
 * added extended support for OCCI-OS
 * updated human-readable output rendering

data/lib/occi/cli/version.rb

@@ -1,5 +1,5 @@
 module Occi
   module Cli
-    VERSION = "4.0.1" unless defined?(::Occi::Cli::VERSION)
+    VERSION = "4.1.0" unless defined?(::Occi::Cli::VERSION)
   end
 end

data/occi-cli.gemspec

@@ -18,9 +18,8 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec}/*`.split("\n")
   gem.require_paths = ["lib"]
-  gem.extensions    = 'ext/mkrf_conf.rb'
 
-  gem.add_dependency 'occi-api', '~> 4.0.1'
+  gem.add_dependency 'occi-api', '~> 4.1.0'
   gem.add_dependency 'highline'
   gem.add_dependency 'json'
 
@@ -33,5 +32,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "yard-rspec"
   gem.add_development_dependency "yard-cucumber"
 
-  gem.required_ruby_version     = ">= 1.8.7"
+  gem.required_ruby_version     = ">= 1.9.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-cli
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -20,7 +20,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -197,8 +197,7 @@ email:
 - xparak@mail.muni.cz
 executables:
 - occi
-extensions:
-- ext/mkrf_conf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
@@ -213,7 +212,6 @@ files:
 - bin/occi
 - config/warble.rb
 - doc/macosx.md
-- ext/mkrf_conf.rb
 - lib/occi-cli.rb
 - lib/occi/cli/helpers.rb
 - lib/occi/cli/occi_opts.rb
@@ -241,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/ext/mkrf_conf.rb

@@ -1,34 +0,0 @@
-require 'rubygems'
-require 'rubygems/command.rb'
-require 'rubygems/dependency_installer.rb' 
-
-begin
-  Gem::Command.build_args = ARGV
-rescue NoMethodError
-  # do nothing but warn the user
-  warn "Gem::Command doesn't have a method named 'build_args'!"
-end 
-
-warn 'Installing platform-specific dependencies.'
-
-warn 'Installing the most recent version of \'rake\''
-inst = Gem::DependencyInstaller.new
-inst.install "rake"
-
-if RUBY_PLATFORM == "java"
-  warn 'Installing dependencies specific for jRuby'
-
-  jrver = (JRUBY_VERSION || "").split('.').map{ |elm| elm.to_i }
-  if jrver[0] == 1 && jrver[1] < 7
-    warn 'Installing \'jruby-openssl\' for jRuby 1.6.x'
-    inst.install "jruby-openssl"
-  end
-else
-  # Nothing to install for rOCCI-api here
-  #warn 'Installing dependencies specific for Ruby'
-end
-
-# create dummy rakefile to indicate success
-f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w")
-f.write "task :default\n"
-f.close