cloud-appliance-descriptor 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: e93155fae78f1d4312df0dde24c40b64df1f4ed1
-  data.tar.gz: 60452474e3abaf13d9dc5a1d0ad73ddd0575b0b3
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZmMzM2M5OGE5M2I0NjA5N2I0MTBlM2Y3MzM0Mzc1N2YxZDFiNGQxNA==
+  data.tar.gz: !binary |-
+    MmRlZWQ4ZWEwZmI3MDgzNmM5M2U2MDBkYTY5OGQ5NzQxODdiNjFlZQ==
 SHA512:
-  metadata.gz: 90d1b293c661a1d6a586ca312fb7a3c8729ac4ca9d133501f780abaf72f44593e2f5b6dfa31e46a8f4333949c29d0cd5239d4d10003c6e56b5bc15a801a347cb
-  data.tar.gz: 28c2c03702108478ad2dffab513515dba9565f28e76447ff9180884c0a7ec7fad25ce0f56a8ea4a5495d05aeafedfacee88d22f2f043495ca9d1383312cfbf48
+  metadata.gz: !binary |-
+    ZTRlMWM0ZmQ2NjU1NjMwYjIxMDQ0ZjFmY2Q1MjQxZmE1NDMxNjBkMjg5MTVk
+    NGJiZmEwNjhmZDg1NTU3NDA5Y2QzNmYwYmM1MGYxYmY5OWIyNWE0NjEyMGY1
+    Y2YxOTBlNzc2MWYyYTE2OWFmYmUyNzFiN2NjNzZlYjlhODdlYjQ=
+  data.tar.gz: !binary |-
+    NWQ1OGRhZTliMzNjMjVmNWE3N2MzNDVmZThlZmQyNTMxYzk1YzEyMWNiN2Zi
+    MzRiOTM4YzMzNmM5ZDcyMGQwOTUyODc1OGE5MDIxZTM5Y2M2ZmY1Y2U1ODRk
+    NDVlY2MzNDIxN2M4NTkxYjkyOTk4MzRkM2JlNDYyMjBkOWQwYjA=

data/lib/cloud/appliance/descriptor/appliance.rb

@@ -27,22 +27,22 @@ module Cloud
           end
 
           variables['os'] = os.to_hash
-          variables['disks'] = disks.map{ |disk| disk.to_hash }
+          variables['disks'] = disks.map(&:to_hash)
 
-          { action => variables }.to_json
+          JSON.pretty_generate(action => variables)
         end
 
         def self.from_json(string)
           raw = JSON.parse(string)
-          self.from_hash(raw)
+          from_hash(raw)
         end
 
         def self.from_hash(hash)
           hash.each do |key, value|
             action = key
             parameters = value
-            os = parameters.delete "os"
-            disks = parameters.delete "disks"
+            os = parameters.delete 'os'
+            disks = parameters.delete 'disks'
             parameters[:action] = action
 
             appliance = Appliance.new parameters

data/lib/cloud/appliance/descriptor/version.rb

@@ -1,7 +1,7 @@
 module Cloud
   module Appliance
     module Descriptor
-      VERSION = '0.2.1'
+      VERSION = '0.2.2'
     end
   end
 end

data/spec/cloud/appliance/descriptor/appliance_spec.rb

@@ -42,7 +42,7 @@ module Cloud
           end
 
           context 'with arguments representing appliance variables' do
-            let(:appliance) { Appliance.new action: :create, title: 'Title', description: 'description', identifier: 'id', cpu: 5, memory: 2048, version: '548242', groups: ['GROUP1', 'GROUP2'] }
+            let(:appliance) { Appliance.new action: :create, title: 'Title', description: 'description', identifier: 'id', cpu: 5, memory: 2048, version: '548242', groups: %w(GROUP1 GROUP2) }
 
             it 'creates appliance instance and populete its instance variables' do
               is_expected.to be_an_instance_of Appliance
@@ -58,7 +58,7 @@ module Cloud
               expect(subject.identifier).to eq('id')
               expect(subject.title).to eq('Title')
               expect(subject.action).to eq(:create)
-              expect(subject.groups).to eq(['GROUP1', 'GROUP2'])
+              expect(subject.groups).to eq(%w(GROUP1 GROUP2))
             end
           end
 
@@ -111,7 +111,7 @@ module Cloud
 
         describe '.remove_group' do
           let(:group) { double('group') }
-          let(:appliance) { Appliance.new groups: [group]}
+          let(:appliance) { Appliance.new groups: [group] }
 
           it 'removes group from groups array' do
             expect(subject.groups).to contain_exactly(group)
@@ -132,7 +132,7 @@ module Cloud
 
         describe '.remove_disk' do
           let(:disk) { double('disk') }
-          let(:appliance) { Appliance.new disks: [disk]}
+          let(:appliance) { Appliance.new disks: [disk] }
 
           it 'removes disk from disks array' do
             expect(subject.disks).to contain_exactly(disk)
@@ -142,7 +142,7 @@ module Cloud
         end
 
         describe '.add_attribute' do
-          let(:attribute) { { :key => :value } }
+          let(:attribute) { { key: :value } }
 
           it 'adds attribute to attributes hash' do
             expect(subject.attributes).to be_empty
@@ -152,7 +152,7 @@ module Cloud
         end
 
         describe '.remove_attribute' do
-          let(:attribute) { { :key => :value } }
+          let(:attribute) { { key: :value } }
           let(:appliance) { Appliance.new attributes: attribute }
 
           it 'removes attribute from attributes hash' do
@@ -163,13 +163,13 @@ module Cloud
         end
 
         describe '.to_json' do
-          let(:os) { Os.new distribution: 'Ubuntu', version: '14.04'}
+          let(:os) { Os.new distribution: 'Ubuntu', version: '14.04' }
           let(:disk1) { Disk.new type: :os, format: :raw }
           let(:disk2) { Disk.new type: :data, format: :qcow2 }
-          let(:appliance) {Appliance.new action: :create, title: 'Title', version: '548242', groups: ['GROUP1', 'GROUP2'], os: os, disks: [disk1, disk2], attributes: { "KEY1"=>"VALUE1", "KEY2"=>"VALUE2" } }
-          let(:disks) { [{"type"=>"data", "format"=>"qcow2"}, {"type"=>"os", "format"=>"raw"}] }
+          let(:appliance) { Appliance.new action: :create, title: 'Title', version: '548242', groups: %w(GROUP1 GROUP2), os: os, disks: [disk1, disk2], attributes: { 'KEY1' => 'VALUE1', 'KEY2' => 'VALUE2' } }
+          let(:disks) { [{ 'type' => 'data', 'format' => 'qcow2' }, { 'type' => 'os', 'format' => 'raw' }] }
 
-          let(:json) { {"create"=>{"title"=>"Title", "version"=>"548242", "groups"=>["GROUP1","GROUP2"], "attributes"=>{"KEY1"=>"VALUE1", "KEY2"=>"VALUE2"}, "description"=>"", "memory"=>1024, "cpu"=>1, "os"=>{"distribution"=>"Ubuntu", "version"=>"14.04", "arch"=>"x86_64", "type"=>"linux"}, "disks"=>[]}} }
+          let(:json) { { 'create' => { 'title' => 'Title', 'version' => '548242', 'groups' => %w(GROUP1 GROUP2), 'attributes' => { 'KEY1' => 'VALUE1', 'KEY2' => 'VALUE2' }, 'description' => '', 'memory' => 1024, 'cpu' => 1, 'os' => { 'distribution' => 'Ubuntu', 'version' => '14.04', 'arch' => 'x86_64', 'type' => 'linux' }, 'disks' => [] } } }
 
           it 'converts appliance object into its JSON representation' do
             hash = JSON.parse(subject.to_json)
@@ -188,11 +188,11 @@ module Cloud
             expect(subject.action).to eq('create')
             expect(subject.title).to eq('Title')
             expect(subject.version).to eq('548242')
-            expect(subject.groups).to eq(['GROUP1', 'GROUP2'])
+            expect(subject.groups).to eq(%w(GROUP1 GROUP2))
             expect(subject.cpu).to eq(1)
             expect(subject.memory).to eq(1024)
             expect(subject.description).to eq('')
-            expect(subject.attributes).to eq({ "KEY1"=>"VALUE1", "KEY2"=>"VALUE2" })
+            expect(subject.attributes).to eq('KEY1' => 'VALUE1', 'KEY2' => 'VALUE2')
             expect(subject.os.distribution).to eq('Ubuntu')
             expect(subject.os.version).to eq('14.04')
             expect(subject.os.type).to eq('linux')
@@ -200,7 +200,7 @@ module Cloud
             expect(subject.disks.size).to eq(2)
 
             disks = subject.disks
-            disks.sort_by! { |disk| disk.type }
+            disks.sort_by!(&:type)
 
             expect(disks[0].type).to eq('data')
             expect(disks[0].format).to eq('qcow2')
@@ -210,18 +210,18 @@ module Cloud
         end
 
         describe '#from_hash' do
-          let(:hash) { {"create"=>{"title"=>"Title", "version"=>"548242", "groups"=>["GROUP1","GROUP2"], "attributes"=>{"KEY1"=>"VALUE1", "KEY2"=>"VALUE2"}, "description"=>"", "memory"=>1024, "cpu"=>1, "os"=>{"distribution"=>"Ubuntu", "version"=>"14.04", "arch"=>"x86_64", "type"=>"linux"}, "disks"=>[{"type"=>"data", "format"=>"qcow2"}, {"type"=>"os", "format"=>"raw"}]}} }
+          let(:hash) { { 'create' => { 'title' => 'Title', 'version' => '548242', 'groups' => %w(GROUP1 GROUP2), 'attributes' => { 'KEY1' => 'VALUE1', 'KEY2' => 'VALUE2' }, 'description' => '', 'memory' => 1024, 'cpu' => 1, 'os' => { 'distribution' => 'Ubuntu', 'version' => '14.04', 'arch' => 'x86_64', 'type' => 'linux' }, 'disks' => [{ 'type' => 'data', 'format' => 'qcow2' }, { 'type' => 'os', 'format' => 'raw' }] } } }
           let(:appliance) { Appliance.from_hash(hash) }
 
           it 'returns appliance object from its hash representation' do
             expect(subject.action).to eq('create')
             expect(subject.title).to eq('Title')
             expect(subject.version).to eq('548242')
-            expect(subject.groups).to eq(['GROUP1','GROUP2'])
+            expect(subject.groups).to eq(%w(GROUP1 GROUP2))
             expect(subject.cpu).to eq(1)
             expect(subject.memory).to eq(1024)
             expect(subject.description).to eq('')
-            expect(subject.attributes).to eq({ "KEY1"=>"VALUE1", "KEY2"=>"VALUE2" })
+            expect(subject.attributes).to eq('KEY1' => 'VALUE1', 'KEY2' => 'VALUE2')
             expect(subject.os.distribution).to eq('Ubuntu')
             expect(subject.os.version).to eq('14.04')
             expect(subject.os.type).to eq('linux')
@@ -229,7 +229,7 @@ module Cloud
             expect(subject.disks.size).to eq(2)
 
             disks = subject.disks
-            disks.sort_by! { |disk| disk.type }
+            disks.sort_by!(&:type)
 
             expect(disks[0].type).to eq('data')
             expect(disks[0].format).to eq('qcow2')

data/spec/cloud/appliance/descriptor/disk_spec.rb

@@ -64,9 +64,9 @@ module Cloud
           let(:disk) { Disk.new type: :os, format: :raw, path: '/path/to/image' }
 
           it 'returns hash representation of disk instance - instance variables as keys with their values' do
-            expect(subject.to_hash).to eq({"type" => :os, "format" => :raw,"path" => "/path/to/image"})
+            expect(subject.to_hash).to eq('type' => :os, 'format' => :raw, 'path' => '/path/to/image')
             subject.target = 'vda'
-            expect(subject.to_hash).to eq({"type" => :os, "format" => :raw, "path" => "/path/to/image", "target" => "vda"})
+            expect(subject.to_hash).to eq('type' => :os, 'format' => :raw, 'path' => '/path/to/image', 'target' => 'vda')
           end
         end
       end

data/spec/cloud/appliance/descriptor/os_spec.rb

@@ -70,9 +70,9 @@ module Cloud
           let(:os) { Os.new distribution: 'Ubuntu' }
 
           it 'returns hash representation of os instance - instance variables as keys with their values' do
-            expect(subject.to_hash).to eq({"arch" => :x86_64, "type" => :linux, "distribution" => "Ubuntu"})
+            expect(subject.to_hash).to eq('arch' => :x86_64, 'type' => :linux, 'distribution' => 'Ubuntu')
             subject.version = '14.04'
-            expect(subject.to_hash).to eq({"arch" => :x86_64, "type" => :linux, "distribution" => "Ubuntu", "version" => "14.04"})
+            expect(subject.to_hash).to eq('arch' => :x86_64, 'type' => :linux, 'distribution' => 'Ubuntu', 'version' => '14.04')
           end
         end
       end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: cloud-appliance-descriptor
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-10 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.32'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.32'
 description: Helper gem to ease creation of cloud appliance descriptor.
@@ -101,9 +101,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -132,17 +132,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Helper gem to ease creation of cloud appliance descriptor.