oneacct-export 0.3.0 → 0.4.2

data/spec/oneacct_exporter_spec.rb

@@ -42,10 +42,7 @@ describe OneacctExporter do
 
     context 'with increasing batch number' do
       before :example do
-        expect(oda).to receive(:vms).with(0, nil, nil).ordered { [1, 2, 3] }
-        expect(oda).to receive(:vms).with(1, nil, nil).ordered { [4, 5, 6] }
-        expect(oda).to receive(:vms).with(2, nil, nil).ordered { [7, 8, 9] }
-        expect(oda).to receive(:vms).with(3, nil, nil).ordered { nil }
+        expect(oda).to receive(:vms).exactly(4).times.and_return([1, 2, 3], [4, 5, 6], [7, 8, 9], nil)
       end
 
       it 'will always finish when there are no more vms to process' do
@@ -56,10 +53,7 @@ describe OneacctExporter do
     context 'with non-empty batches of vms' do
       before :example do
         Sidekiq::Worker.clear_all
-        allow(oda).to receive(:vms).with(0, nil, nil).ordered { [1, 2, 3] }
-        allow(oda).to receive(:vms).with(1, nil, nil).ordered { [4, 5, 6] }
-        allow(oda).to receive(:vms).with(2, nil, nil).ordered { [7, 8, 9] }
-        allow(oda).to receive(:vms).with(3, nil, nil).ordered { nil }
+        allow(oda).to receive(:vms).exactly(4).times.and_return([1, 2, 3], [4, 5, 6], [7, 8, 9], nil)
       end
 
       after :example do
@@ -82,11 +76,7 @@ describe OneacctExporter do
     context 'with some empty batches of vms' do
       before :example do
         Sidekiq::Worker.clear_all
-        allow(oda).to receive(:vms).with(0, nil, nil).ordered { [1, 2, 3] }
-        allow(oda).to receive(:vms).with(1, nil, nil).ordered { [] }
-        allow(oda).to receive(:vms).with(2, nil, nil).ordered { [7, 8, 9] }
-        allow(oda).to receive(:vms).with(3, nil, nil).ordered { [] }
-        allow(oda).to receive(:vms).with(4, nil, nil).ordered { nil }
+        allow(oda).to receive(:vms).exactly(5).times.and_return([1, 2, 3], [], [7, 8, 9], [], nil)
       end
 
       after :example do

data/spec/oneacct_opts_spec.rb

@@ -58,6 +58,28 @@ describe OneacctOpts do
   end
 
   describe '#check_options_restrictions' do
+    context 'with both time range start and time period specified' do
+      before :example do
+        options.records_from = Time.now
+        options.records_for = 'week'
+      end
+
+      it 'fails with ArgumentError' do
+        expect { OneacctOpts.check_options_restrictions(options) }.to raise_error(ArgumentError)
+      end
+    end
+
+    context 'with both time range end and time period specified' do
+      before :example do
+        options.records_to = Time.now
+        options.records_for = 'week'
+      end
+
+      it 'fails with ArgumentError' do
+        expect { OneacctOpts.check_options_restrictions(options) }.to raise_error(ArgumentError)
+      end
+    end
+
     context 'with wrong time range' do
       before :example do
         options.records_from = (Time.new + 1000)

data/spec/spec_helper.rb

@@ -9,6 +9,7 @@ require 'one_writer'
 require 'redis_conf'
 require 'one_data_accessor'
 require 'oneacct_exporter'
+require 'oneacct_exporter/version'
 require 'sidekiq/testing'
 require 'oneacct_opts'
 require 'data_validators/data_validator'
@@ -25,4 +26,4 @@ RSpec.configure do |config|
   config.color = true
   config.tty = true
   config.order = 'random'
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneacct-export
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2016-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: settingslogic
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.9
+- !ruby/object:Gem::Dependency
+  name: chronic_duration
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 description: 'Exporting OpenNebula accounting data.  '
 email:
 - kimle.michal@gmail.com
@@ -200,8 +214,16 @@ files:
 - lib/settings.rb
 - lib/sidekiq_conf.rb
 - lib/templates/apel-0.2.erb
+- lib/templates/apel-0.4.erb
 - lib/templates/logstash-0.1.erb
 - lib/templates/pbs-0.1.erb
+- mock/one_data_accessor_cluster_01.xml
+- mock/one_data_accessor_cluster_02.xml
+- mock/one_data_accessor_host_01.xml
+- mock/one_data_accessor_host_02.xml
+- mock/one_data_accessor_host_03.xml
+- mock/one_data_accessor_host_04.xml
+- mock/one_data_accessor_host_05.xml
 - mock/one_worker_vm_dn01.xml
 - mock/one_worker_vm_dn02.xml
 - mock/one_worker_vm_empty_disk_records.xml
@@ -212,6 +234,11 @@ files:
 - mock/one_worker_vm_image_name04.xml
 - mock/one_worker_vm_image_name05.xml
 - mock/one_worker_vm_image_name06.xml
+- mock/one_worker_vm_number_of_public_ips_01.xml
+- mock/one_worker_vm_number_of_public_ips_02.xml
+- mock/one_worker_vm_number_of_public_ips_03.xml
+- mock/one_worker_vm_search_benchmark_01.xml
+- mock/one_worker_vm_search_benchmark_02.xml
 - mock/one_writer_testfile
 - oneacct-export.gemspec
 - spec/data_validators/apel_data_validator_spec.rb
@@ -247,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Exporting OpenNebula accounting data.