fog-openstack 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57deefcd73bd729138eb23ed6b27a7d5edebd986
-  data.tar.gz: 3f0e6066357fcac8d96ef1acace0ecc03336de19
+  metadata.gz: 77699371cb9d1cea2f5ced1bc246594c70b412da
+  data.tar.gz: 875158fd7550f7714b0f4082ec8e7a9a0b4684ef
 SHA512:
-  metadata.gz: be0002aaf6e52c2578b3ec290e5cbe1dd7ef3fb30e1c5d58827e0de2c8fef58a99b812cf6e64c131f36a09c7b3d025d00731a277da19fa96f0e1f7080c67f8a5
-  data.tar.gz: 76d3fffed28f2442446a69c41a71eeba4eb1684183417fb605ee16a524425cc7a93dc4fc8c57d9da76901107b97514eaf9d1cba2eec2c80228fc948780a3c6a3
+  metadata.gz: 46745f15db6c180aa55ead7a7ae8246b73bfcd489c54feb8f929b5678b9dfb9b74a0a9ecbec18697c9e70d72fce98519e8df4a017cd7638f132e0a74dda3cfba
+  data.tar.gz: 2a683b1003fbfd0dc25f22e59be0c7c02acdc615bb1fbffc8cccf66991162d6ff849d776aa75d6955d6ed823ecc72869212fd33dffe2637096012f11bdd570a3

data/.rubocop.yml

@@ -9,6 +9,7 @@ AlignHash:
 BlockNesting:
   Severity: refactor
 ClassLength:
+  Max: 150
   Severity: refactor
 ClassCheck:
   EnforcedStyle: kind_of?
@@ -30,6 +31,17 @@ LineLength:
 MethodLength:
   Max: 25
   Severity: refactor
+# Exclude test methods from BlockLength.
+Metrics/BlockLength:
+  ExcludedMethods:
+  - after
+  - before
+  - context
+  - describe
+  - it
+  - model_tests
+  - namespace
+  - draw  
 ParameterLists:
   Severity: refactor
 PerceivedComplexity:

data/.travis.yml

@@ -3,7 +3,7 @@ sudo: false
 before_install:
   - gem update bundler
 script:
-  - bundle exec rake test
+  - bundle exec rake test TESTOPTS="--verbose"
   - bundle exec rake spec
 env:
   - JRUBY_OPTS=--debug

data/README.md

@@ -113,7 +113,7 @@ p compute.flavors
 #         disk=1,
 #         vcpus=1,
 #         ...
-#       >, 
+#       >,
 #                   <Fog::Compute::OpenStack::Flavor
 #         id="2",
 #         name="m1.small",
@@ -182,7 +182,7 @@ security_group = compute.security_groups.create name:  "Test SSH",
 #     description="Allow access to port 22",
 #     security_group_rules=    <Fog::Compute::OpenStack::SecurityGroupRules
 #       [
-              
+
 #       ]
 #     >,
 #     tenant_id="06a9a90c60074cdeae5f7fdd0048d9ac"
@@ -418,7 +418,7 @@ identity.projects
 #         description="Project 1",
 #         enabled=true,
 #         name="project_1",
-#       >, 
+#       >,
 #        ...
 #        ]
 
@@ -539,9 +539,28 @@ neutron.add_router_interface router.id, subnet.id
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+```
+$ git clone https://github.com/fog/fog-openstack.git # Clone repository
+$ cd fog-openstack; bin/setup   # Install dependencies from project directory
+$ bundle exec rake test   # Run tests
+$ bundle exec rake spec   # Run tests
+$ bin/console   # Run interactive prompt that allows you to experiment (optional)
+$ bundle exec rake install   # Install gem to your local machine (optional)
+```
+
+You can also use a docker image for development and running tests. Once you have
+cloned the repository, it can be run with:
+```
+$ docker-compose up test
+$ docker-compose up ruby # Start a container with the ruby environment
+```
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+In order to release a new version, perform the following steps:
+
+1. Update version number in `version.rb`.
+2. Run `bundle exec rake release`, which will create a git tag for the version.
+3. Push git commits and tags.
+4. Push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 
@@ -551,4 +570,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/fog/fo
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/docker-compose.yml

@@ -0,0 +1,44 @@
+#
+# This file allows to:
+#   - create a ruby docker environment for development
+#   - run a testsuite from scratch like .travis.yml
+#
+# Run all tests with
+#
+# $ docker-compose up test
+#
+# Create the develompent environment with
+#
+# $ docker-compose up -d ruby
+# $ docker exec -ti fogopenstack_ruby_1  /bin/bash
+#
+version: '2'
+
+services:
+
+  ruby:
+    image: ruby:2.4-stretch
+    cap_add:
+    - SYS_PTRACE
+    volumes:
+    - .:/code:z
+    - .:/home/travis/build/fog/fog-openstack:z
+    entrypoint: tail -f /etc/hosts
+
+  test:
+    image: ruby:2.4-stretch
+    cap_add:
+    - SYS_PTRACE
+    volumes:
+    - .:/code:z
+    - .:/home/travis/build/fog/fog-openstack:z
+    environment:
+    - JRUBY_OPTS=--debug 
+    working_dir: /home/travis/build/fog/fog-openstack
+    entrypoint: |
+      bash -c '
+        gem update bundler --verbose
+        bundle install --verbose
+        bundle exec rake test
+        bundle exec rake spec
+        '

data/lib/fog/compute/openstack.rb

@@ -396,7 +396,7 @@ module Fog
 
           authenticate
 
-          unless @path =~ %r{/(v2|v2\.0|v2\.1)/}
+          unless @path =~ %r{/(v2|v2\.0|v2\.1)}
             raise Fog::OpenStack::Errors::ServiceUnavailable,
                   "OpenStack compute binding only supports version v2 and v2.1"
           end

data/lib/fog/openstack/core.rb

@@ -145,7 +145,7 @@ module Fog
 
       def headers(additional_headers)
         additional_headers ||= {}
-        if @microversion
+        unless @microversion.nil? || @microversion.empty?
           microversion_value = if @microversion_key == 'Openstack-API-Version'
                                  "#{@microversion_service_type} #{@microversion}"
                                else

data/lib/fog/openstack/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Openstack
-    VERSION = "0.1.23"
+    VERSION = "0.1.24"
   end
 end

data/lib/fog/storage/openstack.rb

@@ -44,7 +44,22 @@ module Fog
       request :post_set_meta_temp_url_key
       request :public_url
 
+      module Utils
+        def require_mime_types
+          # Use mime/types/columnar if available, for reduced memory usage
+          require 'mime/types/columnar'
+          rescue LoadError
+            begin
+              require 'mime/types'
+            rescue LoadError
+              Fog::Logger.warning("'mime-types' missing, please install and try again.")
+              exit(1)
+            end
+          end
+      end
+
       class Mock
+        include Utils
         def self.data
           @data ||= Hash.new do |hash, key|
             hash[key] = {}
@@ -56,6 +71,7 @@ module Fog
         end
 
         def initialize(options = {})
+          require_mime_types
           @openstack_api_key = options[:openstack_api_key]
           @openstack_username = options[:openstack_username]
           @path = '/v1/AUTH_1234'
@@ -81,6 +97,7 @@ module Fog
       end
 
       class Real
+        include Utils
         include Fog::OpenStack::Core
 
         def self.not_found_class
@@ -88,6 +105,7 @@ module Fog
         end
 
         def initialize(options = {})
+          require_mime_types
           initialize_identity options
 
           @openstack_service_type           = options[:openstack_service_type] || ['object-store']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-openstack
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Matt Darby
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -214,6 +214,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- docker-compose.yml
 - docs/common/connection_params.md
 - docs/common/resources.md
 - docs/compute.md