tes-request 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fa532f62738e7142b2f039a5e296782950eaa0c
-  data.tar.gz: 90b74b9d517bd257f5e0b622950b69859f6684ee
+  metadata.gz: f2801298fca82cc8a1001b03f767bc40762bb584
+  data.tar.gz: d03c89d8663d1e995ba8874a6f5a47decb86e7b9
 SHA512:
-  metadata.gz: ad8c2f41d62e1080c1efbaffcc1adcd2fb2a444b8aa287c402ead0cf6850f12bbfb95da4cdfefc1dc7fcd0f11ee87590802529eb6115b3025e9617f0115876ef
-  data.tar.gz: 910a0c140f1240800d659671d6131d8706d5b37e80029b78fdd580b728997068a1dc9e6bcdf83d3eae34831cb8d387630f13ca39655ae872ea6b02168348d4ff
+  metadata.gz: 5a804cb2eec661e57d60fb074ee95e7d4d070b1f4aa8df3992e6497fa5fa7b4f101cef785ce195d9e9e54b6de1bd9304231068f9ec968e542fca84fe7c356e20
+  data.tar.gz: af30855c4cc23fd18318eb78bd3dab35b171bd216cb08cfe5cba2937180fef4aa927e2b977d59a0f39764b6df96f91786cb00c99467f8858af835534e54cf0ba

data/.travis.yml

@@ -14,8 +14,7 @@ script:
   - bundle exec rspec
 deploy:
   provider: rubygems
-  api-key:
-    secure: VILjurTJb9jwpQE+RVQ93DZjqR2nVrjkuh8TAIEiaKjGvLdFqWN5QBQ8BRRU+7nOLowyp0YB+/TYRd0oNslz+BZDEgisLWmzjvDXdJQtZuk/2TnslumTctF3uz9ankwESaBrembgC/BPye/Xpio8oaXx9huOGYqIKD8cKX1U8/lFZKCfRIHCYo+7iETBdifBp6e3jj3ABGrCeurcvC0GUPlhcnYrYTjvXsmLVCxQCWyQZ7KfW/9dnqI2ssfeTLgg6VGO5uCR+dvKaiZis9YKICfrmaKSsZBQrHXr49b7jnizTkAVbg/JG9LG/Y+Xs8LeF/8Rx270EEP0TKnwpzWzzOn2yV6D7TeFnzHq0xn+0xoehtcL0jNv7rAGgCzkS4CrR0fWdAITZylhHYBVx4aTLhJ3SEVMxexuyych6JhSWVDvq7ouYIyBKhDtHKTpTQjznsqAGVAxWXjRlbd/GOzwvwqB32pgnqfHQX7zMMOGQk0t4nHMVIieSfVetOXXUAERjiMAajWJTwI0/exeodzD0vVF9kfpOB1RLtQgSYxOyD2nu8TSloxiF5ZLzypQw1wRg0ctzpOUuz/tgIHtyK9gJtY1XYV4mgXlEdtteM6GdYoLj8AKjaOpi9evEM+QnGYsI4xoLq4P6XgDjyBpzFoUkBO8E7u0nPQRsB86yqLINLI=
+  api-key: $RUBYGEMS_API_KEY
   on:
     tags: true
     rvm: 2.4.1

data/README.md

@@ -1,8 +1,9 @@
 # Tes::Request
 
-TES(Test Env Service) request profile struct and manager lib
-
 [![Build Status](https://travis-ci.org/wuhuizuo/tes-request.svg)](https://travis-ci.org/wuhuizuo/tes-request)
+[![Gem Version](https://badge.fury.io/rb/tes-request.svg)](https://rubygems.org/gems/tes-request)
+
+TES(Test Env Service) request profile struct, manager lib and request tools
 
 ## Installation
 
@@ -18,9 +19,13 @@ And then execute:
 Or install it yourself as:
 
     $ gem install tes-request
+    # check bins:
+    $ tes-ci-slicer
+    $ tes-client
     
 ## Usage
 
+### tes-ci-slicer
 Given you project root path: `/project/root/path`, and there has file `.ci.yml`, file contents as follow:
 
 ```yml
@@ -54,24 +59,35 @@ end
 
 Then you need to slice all spec script to several paralleled jobs.
 
-**Step:**
-
-1. install this gem
-2. run cmds like:
+**Step:** run cmds like
 
 ```bash
 tes-ci-slicer properties apps/test_project func_test 16 apps/test_project/res_attr_add_map.json
 ```
 
-## Development
+### tes-client
 
-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.
+```bash
+# run tes-client without args to sees help usage:
+$ tes-client
+
+# Usage:
+#     % /usr/local/bin/tes-client {TesWebUrl} {User} request_res  {ResourceId}  [1|0]                       # Request Specified Resource
+#     % /usr/local/bin/tes-client {TesWebUrl} {User} release_res  {ResourceId}                              # Release Specified Resource
+#     % /usr/local/bin/tes-client {TesWebUrl} {User} request_pool {PoolAskFile} {SaveFile} [TimeoutSeconds] # Request Env Pool 
+#     % /usr/local/bin/tes-client {TesWebUrl} {User} release_pool [PoolFile]                                # Release Env Pool
+```
+
+## Development
 
-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).
+- After checking out the repo, run `bundle` to install dependencies. Then, run `rake spec` to run the tests.
+- 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).
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at http://200.200.0.36/vtt/tes-request. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/wuhuizuo/tes-request. 
+This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 

data/bin/tes-client

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+require 'yaml'
+require 'tes/request/client'
+
+if ARGV.size < 3
+  Tes::Request::ClientBin.exit_usage($0, 2)
+else
+  tes_web_url = ARGV.shift
+  tes_op_user = ARGV.shift
+  tes_op_type = ARGV.shift
+  tes_op_args = ARGV
+
+  Tes::Request::ClientBin.
+      new(tes_web_url, tes_op_user).
+      run(tes_op_type, tes_op_args, $0)
+end

data/lib/tes/request/client.rb

@@ -1,4 +1,6 @@
 require 'json'
+require 'httpclient'
+require 'timeout'
 
 module Tes
   module Request
@@ -37,8 +39,11 @@ module Tes
         ret
       end
 
-      def request_res(id, user)
-        res = @driver.post("/res/#{id}/lock", body: {user: user})
+      # @param [String] id resource id
+      # @param [String] user lock/using username
+      # @param [1,0] lock need lock? `false` == shared using
+      def request_res(id, user, lock=1)
+        res = @driver.post("/res/#{id}/lock", body: {user: user, lock: lock})
         parse_res res
       end
 
@@ -68,5 +73,108 @@ module Tes
         end
       end
     end
+
+    class ClientBin
+      def self.exit_usage(program, exit_code=2)
+        puts <<EOF
+Usage:
+    % #{program} {TesWebUrl} {User} request_res  {ResourceId}  [1|0]                       # Request Specified Resource
+    % #{program} {TesWebUrl} {User} release_res  {ResourceId}                              # Release Specified Resource
+    % #{program} {TesWebUrl} {User} request_pool {PoolAskFile} {SaveFile} [TimeoutSeconds] # Request Env Pool 
+    % #{program} {TesWebUrl} {User} release_pool [PoolFile]                                # Release Env Pool
+EOF
+        exit exit_code
+      end
+
+      def initialize(tes_url, user)
+        driver = HTTPClient.new(base_url: tes_url)
+        driver.ssl_config.verify_mode= OpenSSL::SSL::VERIFY_NONE
+        @client = Client.new(driver)
+        @user = user
+      end
+
+      # Cli runner method
+      # @param [String] op_type
+      # @param [Array<String>] op_args
+      def run(op_type, op_args, program = __FILE__)
+        assert_args(op_type, op_args) ? send(op_type, *op_args) : self.exit_usage(program, 2)
+      end
+
+      private
+
+      def assert_args(op_type, op_args)
+        case op_type
+          when 'request_res'
+            op_args.size.between?(1, 2)
+          when 'release_res'
+            op_args.size == 1
+          when 'request_pool'
+            op_args.size.between?(2, 3)
+          when 'release_pool'
+            op_args.size.between?(0, 1)
+          else
+            false
+        end
+      end
+
+      def request_res(res_id, lock=0)
+        ret = @client.request_res(res_id, @user, lock)
+
+        msg_suffix = "Request resource:(id: #{res_id}, user: #{@user}, lock: #{lock})."
+        ret[:success] ? puts("[ OK ] #{msg_suffix}") : warn("[Fail] #{msg_suffix}")
+
+        ret[:success]
+      end
+
+      def release_res(res_id)
+        ret = @client.release_res(res_id, @user)
+
+        msg_suffix = "Release resource:(id: #{res_id}, user: #{@user})."
+        ret[:success] ? puts("[ OK ] #{msg_suffix}") : warn("[Fail] #{msg_suffix}")
+
+        ret[:success]
+      end
+
+      def release_pool(saved_env_file=nil)
+        if saved_env_file and File.exists?(saved_env_file)
+          env_pool_info = YAML.load_file(saved_env_file)
+          locks = env_pool_info[:lockes]
+          locks.each { |lock| @client.release_res(lock, @user) } if locks
+          puts "[Info] Release env done(user: #{@user}, file: #{saved_env_file})."
+        else
+          @client.release_all_res(@user)
+          puts "[Info] Release env done(user: #{@user})."
+        end
+
+        true
+      end
+
+      # request env pool
+      def request_pool(profile_file, save_file, timeout_secs=0)
+        File.exists?(profile_file) || raise(ArgumentError, "[ ER ] File not found:#{profile_file}")
+
+        asks = File.readlines(profile_file).map!(&:strip).compact
+
+        Timeout.timeout(timeout_secs && timeout_secs.to_i) do
+          print '[Info] Request env...'
+
+          ret = {}
+          until ret[:success]
+            print '.'
+            ret = @client.request_env(@user, asks)
+            sleep 5 unless ret[:success]
+          end
+
+          # request successfully
+          puts 'successfully!'
+          File.open(save_file, 'w') do |f|
+            f.write ret[:data].to_yaml
+            puts '[ OK ] Request env done, saved in: ' + save_file
+          end
+        end
+
+        true
+      end
+    end
   end
 end

data/lib/tes/request/version.rb

@@ -1,5 +1,5 @@
 module Tes
   module Request
-    VERSION = '0.2'
+    VERSION = '0.3'
   end
 end

data/tes-request.gemspec

@@ -9,9 +9,9 @@ Gem::Specification.new do |spec|
   spec.authors = ['wuhuizuo']
   spec.email = ['wuhuizuo@126.com']
 
-  spec.summary = %q{Request Lib for TES(Test Env Service)}
-  spec.description = %q{可供 Tes-Client, Tes-Provider使用的公共关于环境表达式的处理库}
-  spec.homepage = 'http://github.com/wuhuizuo/tes-request'
+  spec.summary = %q{Request libs and bins for TES(Test Env Service)}
+  spec.description = %q{Provide Tes-Client, Tes-Provider to use public Logic and data struct}
+  spec.homepage = 'https://github.com/wuhuizuo/tes-request'
   spec.license = 'MIT'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'java-properties', '~> 0.2'
+  spec.add_runtime_dependency 'httpclient', '~> 2.8.3'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'bundler', '~> 1.13'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tes-request
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - wuhuizuo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: java-properties
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,11 +80,12 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
-description: 可供 Tes-Client, Tes-Provider使用的公共关于环境表达式的处理库
+description: Provide Tes-Client, Tes-Provider to use public Logic and data struct
 email:
 - wuhuizuo@126.com
 executables:
 - tes-ci-slicer
+- tes-client
 extensions: []
 extra_rdoc_files: []
 files:
@@ -83,6 +98,7 @@ files:
 - README.md
 - Rakefile
 - bin/tes-ci-slicer
+- bin/tes-client
 - lib/hash.rb
 - lib/tes/request.rb
 - lib/tes/request/ask.rb
@@ -96,7 +112,7 @@ files:
 - lib/tes/request/rspec/profile_parser.rb
 - lib/tes/request/version.rb
 - tes-request.gemspec
-homepage: http://github.com/wuhuizuo/tes-request
+homepage: https://github.com/wuhuizuo/tes-request
 licenses:
 - MIT
 metadata:
@@ -117,9 +133,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Request Lib for TES(Test Env Service)
+summary: Request libs and bins for TES(Test Env Service)
 test_files: []
-has_rdoc: