occi-core 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d523a58448adfcac4670df02b7666b1a9e48c7da
-  data.tar.gz: 2442b720cd5e338f33bfcf92f3da9ce1a3bff0c0
+  metadata.gz: 136ea405fc28df1ba974238e15868846e6b9c642
+  data.tar.gz: d143cff13d9d828ff10b8b895d01a096e9c5795e
 SHA512:
-  metadata.gz: 02bf8369a2c0c5a084e670b2f106d43ba83312ba0e0bd2ae7b84421da32e2aa592f7f95b51a2c892f7ea5160cf7aa72a894245c1e91e194e13acb4859874f217
-  data.tar.gz: f8565410f77fd48b20aff72581fb2e477c00e3f8a5e42afc784988b01395360fdcdf3d5329d23b6c2a54b9e905ea26d98c8be2378e6257951a199f46c52032fb
+  metadata.gz: c71d4e04e3b60b555e0f81f21eeedb536c748d09cb25039dfa4e8e1e05e9b6d2b2f8d35baf785cfd106fb87bdd89cb99645b2359679c78e418dd503a6c2d5a70
+  data.tar.gz: 5141b7ed36095b8d3a2ac55aed12e050a2d8eeae87c6414b7662b9434969a5a226ea1b03bad5d205293e466c27ee567b864097919b7b3ca09078c19b9e1e76c1

data/.rubocop.yml

@@ -1,4 +1,3 @@
-require: rubocop-rspec
 inherit_from: .rubocop_todo.yml
 
 Metrics/ModuleLength:
@@ -44,7 +43,7 @@ Style/NilComparison:
   Exclude:
   - 'spec/occi/core/category_spec.rb'
 
-Style/FileName:
+Naming/FileName:
   Exclude:
   - 'lib/occi/infrastructure-ext.rb'
 
@@ -52,16 +51,6 @@ Style/YodaCondition:
   Exclude:
   - 'lib/occi/core/helpers/parser_dereferencer.rb'
 
-RSpec/MultipleExpectations:
-  Max: 5
-
-RSpec/MessageSpies:
-  EnforcedStyle: receive
-
-RSpec/SubjectStub:
-  Exclude:
-    - 'spec/**/*'
-
-RSpec/MessageExpectation:
+Lint/Void:
   Exclude:
-    - 'spec/**/*'
+  - '**/*'

data/.rubocop_todo.yml

@@ -2,3 +2,8 @@ Style/RescueModifier:
   Exclude:
   - 'lib/occi/core/parsers/json/entity.rb'
   - 'lib/occi/core/parsers/text/entity.rb'
+
+Lint/RescueWithoutErrorClass:
+  Exclude:
+  - 'lib/occi/core/parsers/json/entity.rb'
+  - 'lib/occi/core/parsers/text/entity.rb'

data/CHANGELOG.md

@@ -1,4 +1,10 @@
 
+5.0.2 / 2017-09-27
+==================
+
+  * Relaxing strict Regexp patterns on attrs
+  * DOI for releases from ZENODO
+
 5.0.1 / 2017-09-05
 ==================
 

data/README.md

@@ -3,6 +3,7 @@
 [![Gemnasium](https://img.shields.io/gemnasium/the-rocci-project/rOCCI-core.svg?style=flat-square)](https://gemnasium.com/the-rocci-project/rOCCI-core)
 [![Gem](https://img.shields.io/gem/v/occi-core.svg?style=flat-square)](https://rubygems.org/gems/occi-core)
 [![Code Climate](https://img.shields.io/codeclimate/github/the-rocci-project/rOCCI-core.svg?style=flat-square)](https://codeclimate.com/github/the-rocci-project/rOCCI-core)
+[![DOI](https://zenodo.org/badge/101084614.svg)](https://zenodo.org/badge/latestdoi/101084614)
 
 ## Requirements
 ### Ruby

data/lib/occi/core/action_instance.rb

@@ -16,7 +16,8 @@ module Occi
       include Helpers::ArgumentValidator
       include Helpers::InstanceAttributeResetter
 
-      attr_accessor :action, :attributes
+      attr_reader :action
+      attr_accessor :attributes
 
       ERRORS = [
         Occi::Core::Errors::AttributeValidationError,
@@ -133,7 +134,7 @@ module Occi
       # :nodoc:
       def valid_attribute!(name, attribute)
         attribute.valid!
-      rescue => ex
+      rescue StandardError => ex
         raise ex, "Attribute #{name.inspect} invalid: #{ex}", ex.backtrace
       end
     end

data/lib/occi/core/entity.rb

@@ -24,8 +24,9 @@ module Occi
       include Helpers::InstanceAttributeResetter
       include Helpers::MixinSelector
 
-      attr_accessor :kind, :actions, :attributes, :mixins
+      attr_reader :kind, :mixins
       attr_writer :location
+      attr_accessor :actions, :attributes
 
       ERRORS = [
         Occi::Core::Errors::AttributeValidationError, Occi::Core::Errors::AttributeDefinitionError,
@@ -295,7 +296,7 @@ module Occi
       #
       # @return [NilClass] when entity instance is valid
       def valid!
-        %i[kind location attributes mixins actions].each do |attr|
+        %i[kind attributes mixins actions].each do |attr|
           unless send(attr)
             raise Occi::Core::Errors::InstanceValidationError,
                   "Missing valid #{attr}"
@@ -334,7 +335,7 @@ module Occi
       # :nodoc:
       def valid_attribute!(name, attribute)
         attribute.valid!
-      rescue => ex
+      rescue StandardError => ex
         raise ex, "Attribute #{name.inspect} invalid: #{ex}", ex.backtrace
       end
 
@@ -376,8 +377,7 @@ module Occi
       # @return [URI] generated location
       def generate_location
         if id.blank?
-          raise Occi::Core::Errors::MandatoryArgumentError,
-                'Cannot generate default location without an `id`'
+          raise Occi::Core::Errors::MandatoryArgumentError, 'Cannot generate default location without an `id`'
         end
         URI.parse "#{kind.location}#{id}"
       end

data/lib/occi/core/helpers/error_handler.rb

@@ -14,7 +14,7 @@ module Occi
           raise 'You have to provide a block' unless block_given?
           begin
             yield # do whatever you need to do
-          rescue => ex
+          rescue StandardError => ex
             raise klass, ex.message
           end
         end

data/lib/occi/core/helpers/raw_json_parser.rb

@@ -9,7 +9,7 @@ module Occi
         # :nodoc:
         def raw_hash(body)
           JSON.parse body, symbolize_names: true
-        rescue => ex
+        rescue StandardError => ex
           raise Occi::Core::Errors::ParsingError, "JSON parsing failed: #{ex.message}"
         end
       end

data/lib/occi/core/locations.rb

@@ -61,7 +61,7 @@ module Occi
       def valid?
         valid!
         true
-      rescue => ex
+      rescue StandardError => ex
         logger.warn "Location invalid: #{ex.message}"
         false
       end
@@ -73,7 +73,7 @@ module Occi
       # @raise [Occi::Core::Errors::LocationValidationError] if some location is invalid
       def valid!
         map! { |uri| return_or_convert uri }
-      rescue => ex
+      rescue StandardError => ex
         raise Occi::Core::Errors::LocationValidationError, ex.message
       end
       alias convert! valid!

data/lib/occi/core/parsers/json/validator.rb

@@ -11,7 +11,7 @@ module Occi
 
           # Repository constants
           SCHEMA_DIR   = 'validator'.freeze
-          SCHEMA_REPO  = File.join(File.expand_path(File.dirname(__FILE__)), SCHEMA_DIR)
+          SCHEMA_REPO  = File.join(__dir__, SCHEMA_DIR)
           BASE_SCHEMAS = %i[occi-schema].freeze
 
           class << self

data/lib/occi/core/parsers/json_parser.rb

@@ -88,7 +88,7 @@ module Occi
             begin
               Json::Validator.validate! body, type
               found = type
-            rescue => ex
+            rescue StandardError => ex
               logger.debug { "Moving on, body does not contain valid #{type} - #{ex.message.inspect}" }
             end
           end

data/lib/occi/core/version.rb

@@ -2,7 +2,7 @@ module Occi
   module Core
     MAJOR_VERSION = 5                # Major update constant
     MINOR_VERSION = 0                # Minor update constant
-    PATCH_VERSION = 1                # Patch/Fix version constant
+    PATCH_VERSION = 2                # Patch/Fix version constant
     STAGE_VERSION = nil              # use `nil` for production releases
 
     unless defined?(::Occi::Core::VERSION)

data/lib/occi/core/warehouse.rb

@@ -40,7 +40,7 @@ module Occi
 
         # :nodoc:
         def whereami
-          File.expand_path(File.dirname(__FILE__))
+          __dir__
         end
 
         # :nodoc:

data/lib/occi/core/warehouse/kinds/attributes/occi.core.title.yml

@@ -4,4 +4,4 @@ required: false
 mutable: true
 default: ~
 description: Title assigned to this entity sub-type instance.
-pattern: !ruby/regexp '/^[[:word:]]([[:blank:]]|[[:word:]]|\-)*$/'
+pattern: !ruby/regexp '/^.+$/'

data/lib/occi/infrastructure/warehouse.rb

@@ -12,7 +12,7 @@ module Occi
 
         # :nodoc:
         def whereami
-          File.expand_path(File.dirname(__FILE__))
+          __dir__
         end
       end
     end

data/lib/occi/infrastructure/warehouse/actions/compute_save.yml

@@ -16,4 +16,4 @@ attributes:
     mutable: true
     default: ~
     description: Name of the copy
-    pattern: !ruby/regexp '/^[[:alnum:]]+$/'
+    pattern: !ruby/regexp '/^.+$/'

data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.compute.hostname.yml

@@ -4,4 +4,4 @@ required: false
 mutable: true
 default: ~
 description: Compute FQDN.
-pattern: ~
+pattern: !ruby/regexp '/^.+$/'

data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.compute.state.message.yml

@@ -4,4 +4,4 @@ required: false
 mutable: false
 default: ~
 description: Human-readable description of the current state.
-pattern: ~
+pattern: !ruby/regexp '/^.*$/'

data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.network.label.yml

@@ -4,4 +4,4 @@ required: false
 mutable: true
 default: ~
 description: Label of the network instance.
-pattern: ~
+pattern: !ruby/regexp '/^.+$/'

data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.network.state.message.yml

@@ -4,4 +4,4 @@ required: false
 mutable: false
 default: ~
 description: Human-readable description of the current state.
-pattern: ~
+pattern: !ruby/regexp '/^.*$/'

data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.networkinterface.interface.yml

@@ -4,4 +4,4 @@ required: false
 mutable: false
 default: ~
 description: Network interface name.
-pattern: !ruby/regexp '/^[[:alnum:]]+$/'
+pattern: !ruby/regexp '/^.+$/'

data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.networkinterface.state.message.yml

@@ -4,4 +4,4 @@ required: false
 mutable: false
 default: ~
 description: Human-readable description of the current state.
-pattern: ~
+pattern: !ruby/regexp '/^.*$/'

data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.storage.state.message.yml

@@ -4,4 +4,4 @@ required: false
 mutable: false
 default: ~
 description: Human-readable description of the current state.
-pattern: ~
+pattern: !ruby/regexp '/^.*$/'

data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.storagelink.deviceid.yml

@@ -4,4 +4,4 @@ required: false
 mutable: false
 default: ~
 description: Block device ID.
-pattern: !ruby/regexp '/^([[:alnum:]]|-|_|\/)+$/'
+pattern: !ruby/regexp '/^.+$/'

data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.storagelink.mountpoint.yml

@@ -4,4 +4,4 @@ required: false
 mutable: false
 default: ~
 description: Block device mount point.
-pattern: ~
+pattern: !ruby/regexp '/^.+$/'

data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.storagelink.state.message.yml

@@ -4,4 +4,4 @@ required: false
 mutable: false
 default: ~
 description: Human-readable description of the current state.
-pattern: ~
+pattern: !ruby/regexp '/^.*$/'

data/lib/occi/infrastructure_ext/warehouse.rb

@@ -12,7 +12,7 @@ module Occi
 
         # :nodoc:
         def whereami
-          File.expand_path(File.dirname(__FILE__))
+          __dir__
         end
       end
     end

data/lib/occi/infrastructure_ext/warehouse/kinds/attributes/occi.ipreservation.state.message.yml

@@ -4,4 +4,4 @@ required: false
 mutable: false
 default: ~
 description: Human-readable description of the current state.
-pattern: ~
+pattern: !ruby/regexp '/^.*$/'

data/lib/occi/infrastructure_ext/warehouse/kinds/attributes/occi.securitygroup.state.message.yml

@@ -4,4 +4,4 @@ required: false
 mutable: false
 default: ~
 description: Human-readable description of the current state.
-pattern: ~
+pattern: !ruby/regexp '/^.*$/'

data/lib/occi/infrastructure_ext/warehouse/kinds/attributes/occi.securitygrouplink.state.message.yml

@@ -4,4 +4,4 @@ required: false
 mutable: false
 default: ~
 description: Human-readable description of the current state.
-pattern: ~
+pattern: !ruby/regexp '/^.*$/'

data/occi-core.gemspec

@@ -28,7 +28,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'simplecov', '>= 0.11', '< 1'
   gem.add_development_dependency 'pry', '>= 0.10', '< 1'
   gem.add_development_dependency 'rubocop', '>= 0.32', '< 1'
-  gem.add_development_dependency 'rubocop-rspec', '>= 1.5', '< 2'
   gem.add_development_dependency 'rubygems-tasks', '>= 0.2', '< 1'
   gem.add_development_dependency 'yard', '>= 0.8', '< 1'
   gem.add_development_dependency 'fasterer', '>= 0.3.2', '< 0.4'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Boris Parak
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -211,26 +211,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
@@ -594,7 +574,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: The rOCCI core toolkit