occi-core 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
@@ -40,4 +32,6 @@ matrix:
 
 branches:
   only:
-    - master
+    - master
+    - 4.0.x
+    - 4.1.x

data/Gemfile

@@ -5,7 +5,3 @@ gemspec
 group :development do
   gem 'rubygems-tasks', :git => 'git://github.com/postmodern/rubygems-tasks.git'
 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
 ~~~
 
 Installation
@@ -73,7 +71,8 @@ The OCCI gem includes its own logging mechanism using a message queue. By defaul
 A new OCCI Logger can be initialized by specifying the log destination (either a filename or an IO object like
 STDOUT) and the log level.
 
-    Occi::Log.new(STDOUT,Occi::Log::INFO)
+    logger = Occi::Log.new STDOUT
+    logger.level = Occi::Log::INFO
 
 You can create multiple Loggers to receive the log output.
 
@@ -138,6 +137,10 @@ The occi-core gem includes all OCCI Core classes necessary to handly arbitrary O
 Changelog
 ---------
 
+### Version 4.1
+* Dropped support for Rubies 1.8.x
+* Updated dependencies
+
 ### Version 4.0
 * introduced compatibility mode (for OCCI-OS, on by default)
 * introduced new attribute handling for resources

data/lib/occi/parser/text.rb

@@ -1,15 +1,6 @@
 module Occi
   module Parser
     module Text
-      # Backwards compatibility for Ruby 1.8.7 and named groups in regular expressions
-      if RUBY_VERSION =~ /1.8/
-        require 'oniguruma'
-        REGEXP = Oniguruma::ORegexp
-        ONIG = true
-      else
-        REGEXP = Regexp
-        ONIG = false
-      end
 
       # Regular expressions
       REGEXP_QUOTED_STRING = /([^"\\]|\\.)*/
@@ -157,7 +148,7 @@ module Occi
 
       def self.category(string)
         # create regular expression from regexp string
-        regexp = REGEXP.new(REGEXP_CATEGORY)
+        regexp = Regexp.new(REGEXP_CATEGORY)
         # match string to regular expression
         match = regexp.match string
 
@@ -196,7 +187,7 @@ module Occi
 
       def self.attribute(string)
         # create regular expression from regexp string
-        regexp = REGEXP.new(REGEXP_ATTRIBUTE)
+        regexp = Regexp.new(REGEXP_ATTRIBUTE)
         # match string to regular expression
         match = regexp.match string
 
@@ -214,7 +205,7 @@ module Occi
 
       def self.link_string(string, source)
         # create regular expression from regexp string
-        regexp = REGEXP.new(REGEXP_LINK)
+        regexp = Regexp.new(REGEXP_LINK)
         # match string to regular expression
         match = regexp.match string
 
@@ -234,14 +225,10 @@ module Occi
 
         # create an array of the list of attributes
         attributes = []
-        regexp=REGEXP.new '(\\s*'+REGEXP_ATTRIBUTE_REPR.to_s+')'
+        regexp=Regexp.new '(\\s*'+REGEXP_ATTRIBUTE_REPR.to_s+')'
         attr_line = match[:attributes].sub(/^\s*;\s*/, ' ')
-        if ONIG
-          attr_line_scans = regexp.scan(attr_line)
-          attributes = attr_line_scans.collect {|matches| matches.captures.first} if attr_line_scans
-        else
-          attributes = attr_line.scan(regexp).collect {|matches| matches.first}
-        end
+        attributes = attr_line.scan(regexp).collect {|matches| matches.first}
+
         # parse each attribute and create an OCCI Attribute object from it
         attributes = attributes.inject(Hashie::Mash.new) { |hsh, attribute| hsh.merge!(Occi::Parser::Text.attribute('X-OCCI-Attribute: ' + attribute)) }
         Occi::Core::Link.new kind, mixins, attributes, actions, rel, target, source, location
@@ -249,7 +236,7 @@ module Occi
 
       def self.location(string)
         # create regular expression from regexp string
-        regexp = REGEXP.new(REGEXP_LOCATION)
+        regexp = Regexp.new(REGEXP_LOCATION)
         # match string to regular expression
         match = regexp.match string
 

data/lib/occi/version.rb

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

data/occi-core.gemspec

@@ -17,13 +17,12 @@ 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 'json'
   gem.add_dependency 'hashie'
   gem.add_dependency 'uuidtools', '>=2.1.3'
-  gem.add_dependency 'nokogiri', '~>1.5.0'
-  gem.add_dependency 'activesupport', '~>3.2'
+  gem.add_dependency 'nokogiri', '~>1.6.0'
+  gem.add_dependency 'activesupport', '~>4.0.0'
   gem.add_dependency 'settingslogic'
 
   gem.add_development_dependency 'rspec'
@@ -33,5 +32,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'yard-rspec'
 
-  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-core
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -68,7 +68,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +84,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -92,7 +92,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: settingslogic
   requirement: !ruby/object:Gem::Requirement
@@ -212,8 +212,7 @@ email:
 - piotr.kasprzak@gwdg.de
 - xparak@mail.muni.cz
 executables: []
-extensions:
-- ext/mkrf_conf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
@@ -226,7 +225,6 @@ files:
 - README.md
 - Rakefile
 - config/occi.yml
-- ext/mkrf_conf.rb
 - lib/occi-core.rb
 - lib/occi/collection.rb
 - lib/occi/core.rb
@@ -299,7 +297,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,35 +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"
-  # Nothing to install for rOCCI-core
-  #warn 'Installing dependencies specific for jRuby'
-else
-  warn 'Installing dependencies specific for Ruby'
-
-  rver = RUBY_VERSION.split('.').map{ |elm| elm.to_i }
-  if rver[0] == 1 && rver[1] < 9
-    warn 'Installing \'oniguruma\' for Ruby 1.8.x'
-    warn 'Make sure you have \'libonig-dev\' installed!'
-    inst.install "oniguruma"
-  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