vpsb_client 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10ca3e79c344f1e1453d72c01354f772f1349a92
-  data.tar.gz: 5bb7605cad616ec8eb65445f6c497aea5f83ae1b
+  metadata.gz: 17f4f6854b3a86eb3338dd12d0a65656ed657b5b
+  data.tar.gz: 8fb32a5b4d42d02a86368748a43802d9406863f8
 SHA512:
-  metadata.gz: ee479c738e4708b7515c9b5a34b94dbc4ee96d99e26bf6ca7bfea8d2466eb455d9f63457b0b6d1cf55a39dc0ff4787c7685e0a47e1523418c2e66ca02cc33990
-  data.tar.gz: 813ee17457596d106558a87aa8e32ead6b0b85f31bed244dc2401a4dc1530825501f5ff05af2b3c802adb0a3a81c8ad0c53a9e6fe94c6fac7dff33271f8aa219
+  metadata.gz: fde114fced005f8331d27554ee4cc6b18a574a13ff92c4a1296cfa83cb2b318c820e7c49746aaf45bcee4e888f738a53c3cfec8c62e29c3f44a51a8ba3a3911c
+  data.tar.gz: 8cb74c58b641fff871b31cb41b87ed1c6ecef372bfb72bd19f082768a66a90c4dbf68c209f7d48f62f75020b4eca158457fd44d2a4b6b9f0a0a30dd914ba2946

data/bin/create_sysbench_run.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+
+require File.expand_path('../../lib/vpsb_client',  __FILE__)
+
+manager = VpsbClient::Manager.new(File.expand_path('../../config/vpsb.yml',  __FILE__))
+manager.setup
+
+data = <<DATA
+Test execution summary:
+    total time:                          7.8366s
+    total number of events:              20000
+    total time taken by event execution: 31.3283
+    per-request statistics:
+         min:                                  1.35ms
+         avg:                                  1.57ms
+         max:                                 21.53ms
+         approx.  95 percentile:               1.54ms
+DATA
+
+t = manager.create_sysbench_run(1, 'cpu_0_v1', 'sysbench --test=cpu --num-threads=4 --max-requests=20000 run', data)
+if t
+  puts "new sysbench run = #{t.inspect}"
+else
+  puts "no run was created"
+end

data/bin/get_trial_sysbench_tests.rb

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+require File.expand_path('../../lib/vpsb_client',  __FILE__)
+
+manager = VpsbClient::Manager.new(File.expand_path('../../config/vpsb.yml',  __FILE__))
+manager.setup
+
+puts manager.trial_sysbench_tests(1)

data/lib/vpsb_client.rb

@@ -9,6 +9,8 @@ require "#{VPSB_BASE_PATH}/vpsb_client/api/request"
 require "#{VPSB_BASE_PATH}/vpsb_client/api/response"
 require "#{VPSB_BASE_PATH}/vpsb_client/api/get_current_trial_request"
 require "#{VPSB_BASE_PATH}/vpsb_client/api/get_trial_last_metric_request"
+require "#{VPSB_BASE_PATH}/vpsb_client/api/get_trial_sysbench_tests"
+require "#{VPSB_BASE_PATH}/vpsb_client/api/post_sysbench_run"
 require "#{VPSB_BASE_PATH}/vpsb_client/api/get_item_id_request"
 require "#{VPSB_BASE_PATH}/vpsb_client/api/create_trial_request"
 require "#{VPSB_BASE_PATH}/vpsb_client/api/post_metric_request"

data/lib/vpsb_client/api/get_trial_sysbench_tests.rb

@@ -0,0 +1,19 @@
+module VpsbClient
+  module Api
+    class GetTrialSysbenchTests < GetRequest
+      def initialize(http_client, params)
+        super(http_client)
+        @trial_id = params[:trial_id]
+      end
+
+      def url_path
+        "/api/trials/#{@trial_id}/sysbench_tests"
+      end
+
+      def self.tests(http_response)
+        return [] if http_response.parsed_response.empty?
+        http_response.parsed_response
+      end
+    end
+  end
+end

data/lib/vpsb_client/api/post_sysbench_run.rb

@@ -0,0 +1,31 @@
+module VpsbClient
+  module Api
+    class PostSysbenchRun < PostRequest
+
+      def initialize(http_client, trial_id, test_id, command, data)
+        super(http_client)
+        @trial_id = trial_id
+        @test_id = test_id
+        @command = command
+        @data = data
+      end
+
+      def url_path
+        "/api/trials/#{@trial_id}/sysbench_runs"
+      end
+
+      def post_params
+        @post_params = { sysbench_run: {
+            test_id: @test_id,
+            command: @command,
+            data: @data
+          }
+        }
+      end
+
+      def content_type
+        'application/json'
+      end
+    end
+  end
+end

data/lib/vpsb_client/datafiles/sar_manager.rb

@@ -36,7 +36,7 @@ module VpsbClient
         raw_sar_filenames.each do |filename|
           filename.match /sa(?<num>\d+)$/ do |matchdata|
             fileday = matchdata[:num]
-            next if fileday.to_i == Time.now.day
+            next if fileday == Time.now.strftime('%Y%m%d')
 
             formatted_filename = "#{@target_path}/formatted_sa#{fileday}"
             next if File.exist?(formatted_filename)
@@ -46,8 +46,8 @@ module VpsbClient
       end
 
       def create_current_day_temp_formatted
-        sa_filename = "#{@orig_path}/sa#{'%02d' % Time.now.day}"
-        formatted_filename = "#{@target_path}/formatted_sa#{'%02d' % Time.now.day}"
+        sa_filename = "#{@orig_path}/sa#{Time.now.strftime('%Y%m%d')}"
+        formatted_filename = "#{@target_path}/formatted_sa#{Time.now.strftime('%Y%m%d')}"
         File.delete(formatted_filename) if File.exist?(formatted_filename)
         sadf(sa_filename, formatted_filename)
       end
@@ -68,4 +68,4 @@ module VpsbClient
       end
     end
   end
-end
+end

data/lib/vpsb_client/manager.rb

@@ -52,6 +52,12 @@ module VpsbClient
       Api::CreateTrialRequest.trial(http_response)
     end
 
+    def create_sysbench_run(trial_id, test_id, command, data)
+      create_sysbench_run_request = Api::PostSysbenchRun.new(@http_client, trial_id, test_id, command, data)
+      curl_response = create_sysbench_run_request.run
+      http_response = Api::Response.new(curl_response)
+    end
+
     def current_trial
       builder = Builders::Trial.new(@config)
       current_trial_request = Api::GetCurrentTrialRequest.new(@http_client, builder.lookup_params)
@@ -67,6 +73,13 @@ module VpsbClient
       Api::GetTrialLastMetricRequest.started_at(http_response)
     end
 
+    def trial_sysbench_tests(trial_id)
+      trial_sysbench_tests_request = Api::GetTrialSysbenchTests.new(@http_client, trial_id: trial_id)
+      curl_response = trial_sysbench_tests_request.run
+      http_response = Api::Response.new(curl_response)
+      Api::GetTrialSysbenchTests.tests(http_response)
+    end
+
     def hoster_id
       return @hoster_id if @hoster_id
       id_request = Api::GetItemIdRequest.new(@http_client, 'hosters', @config['hoster_name'])
@@ -103,7 +116,7 @@ module VpsbClient
       end
 
       prepare_logfiles
-      
+
       metric_ids = []
       interval_length = 604800
       last_started_at = trial_last_metric_started_at(trial['id'], interval_length)

data/lib/vpsb_client/version.rb

@@ -1,3 +1,3 @@
 module VpsbClient
-  VERSION = "0.0.2"
+  VERSION = "1.0.0"
 end

data/spec/lib/request_spec.rb

@@ -128,6 +128,34 @@ module VpsbClient
         end
       end
 
+      describe GetTrialSysbenchTests do
+        it 'gets /api/trials/:id/sysbench_tests' do
+          @params = {trial_id: 1 }
+          expect(@curl).to receive(:get).with('http://localhost/api/trials/1/sysbench_tests.json').once
+
+          req = GetTrialSysbenchTests.new(@client, @params)
+          req.run
+        end
+      end
+
+      describe PostSysbenchRun do
+        it 'posts to /api/trials/:id/sysbench_runs' do
+          run_params = {
+            sysbench_run: {
+              test_id: 2,
+              command: 'do it',
+              data: 'all done'
+            }
+          }
+          expect(@curl).to receive(:post).with('http://localhost/api/trials/1/sysbench_runs.json',
+                  run_params.to_json,
+                  "application/json").once
+
+          req = PostSysbenchRun.new(@client, 1, 2, 'do it', 'all done')
+          req.run
+        end
+      end
+
       describe PostMetricRequest do
         before :each do
           @trial_id = 1

data/spec/lib/sar_manager_spec.rb

@@ -47,9 +47,9 @@ module VpsbClient
 
       it 'replaces current day formatted file if it exists' do
         system "mkdir #{@target_dir}"
-        system "echo \"hello\" > #{@target_dir}/formatted_sa21"
+        system "echo \"hello\" > #{@target_dir}/formatted_sa20140921"
         @manager.run
-        lines = File.readlines("#{@target_dir}/formatted_sa21")
+        lines = File.readlines("#{@target_dir}/formatted_sa20140921")
         expect(lines.first).not_to match(/hello/)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vpsb_client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Philippe Le Rohellec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-08 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
@@ -113,10 +113,12 @@ email:
 - philippe@lerohellec.com
 executables:
 - close_trial.rb
+- create_sysbench_run.rb
 - create_trial.rb
 - get_current_trial.rb
 - get_item_ids.rb
 - get_trial_last_metric.rb
+- get_trial_sysbench_tests.rb
 - signed_in.rb
 - sync_metrics.rb
 - test_timing_interval.rb
@@ -130,10 +132,12 @@ files:
 - README.md
 - Rakefile
 - bin/close_trial.rb
+- bin/create_sysbench_run.rb
 - bin/create_trial.rb
 - bin/get_current_trial.rb
 - bin/get_item_ids.rb
 - bin/get_trial_last_metric.rb
+- bin/get_trial_sysbench_tests.rb
 - bin/signed_in.rb
 - bin/sync_metrics.rb
 - bin/test_timing_interval.rb
@@ -145,7 +149,9 @@ files:
 - lib/vpsb_client/api/get_current_trial_request.rb
 - lib/vpsb_client/api/get_item_id_request.rb
 - lib/vpsb_client/api/get_trial_last_metric_request.rb
+- lib/vpsb_client/api/get_trial_sysbench_tests.rb
 - lib/vpsb_client/api/post_metric_request.rb
+- lib/vpsb_client/api/post_sysbench_run.rb
 - lib/vpsb_client/api/request.rb
 - lib/vpsb_client/api/response.rb
 - lib/vpsb_client/builders/system_info_parser.rb
@@ -210,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Client gem for vpsbenchmarks.com