yao-yrb 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36e495da2eb2d6c2c882c9d0065a1f5bcab42f5cc35d48dee76b6951ad994f85
-  data.tar.gz: 4e3809381515358e448c5d929d98559d7332f90abe348a83c8a0a09bed4432c4
+  metadata.gz: 12bae1830b59ecc8a229ba917c8d9913333e16e88800f15a146d1578a4816288
+  data.tar.gz: 702c35dec8806feefdd2ca147364ad6d56e5cc178d4b9cf90b01d69ebdb45316
 SHA512:
-  metadata.gz: ab3e8e03415bce0f980846e2fd153f1b0e1f16614ba0772fef5ef0e4cd685a074975894e725afe1242d5e90de35ed27f8079367aa664a3c303f5deb1fc35145e
-  data.tar.gz: 508e281663f90064ae228db4783566b6f419a3a03bc94778d08e3de6f01bb360dd7b6a56ef435d831d177bc0f244145bd52adfe984e1980c2caeba4ec38f3be4
+  metadata.gz: 20214d09df4e381004ba367a7d8463394dd29c0950ba4ed8529c8883d4093828e8b2126c004c4003d97ca0bf7d287c5e7e7194e75b1d03e687731be055fad1c1
+  data.tar.gz: 97f81699ac8dd3f60a7f81e9266b94b98edcbcc323471b49f887c71cdf35fc40917802fae6f5df462da764aebab09c7e44fb6ae115e6f977f59a842bda4569f4

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/Gemfile.lock

data/exe/yrb

@@ -3,4 +3,4 @@
 require 'rubygems'
 require 'yao/yrb'
 
-Yao::Yrb.run
+Yao::Yrb::Cli.run

data/lib/yao/yrb/cli.rb

@@ -0,0 +1,59 @@
+require 'irb'
+require 'irb/completion'
+require 'irb/ext/save-history'
+require 'clamp'
+require 'yao'
+
+# [HACK] allow optional and multivalued parameters
+original_verbosity = $VERBOSE
+$VERBOSE = nil
+Clamp::Parameter::Definition::ELLIPSIS_SUFFIX = / \.\.\.\]?$/
+$VERBOSE = original_verbosity
+
+module Yao::Yrb
+  class Cli < Clamp::Command
+    option '--version', :flag, 'Show version' do
+      puts Yao::Yrb::VERSION
+      exit(0)
+    end
+
+    parameter '[FILE ...]', 'Execute the contents of FILE. If unset, run in Interpreter mode.',
+              attribute_name: :script_mode
+
+    def execute
+      Yao.configure do
+        auth_url              ENV['OS_AUTH_URL']
+        tenant_name           ENV['OS_TENANT_NAME']
+        username              ENV['OS_USERNAME']
+        password              ENV['OS_PASSWORD']
+        client_cert           ENV['OS_CERT']
+        client_key            ENV['OS_KEY']
+        region_name           ENV['OS_REGION_NAME']
+        identity_api_version  ENV['OS_IDENTITY_API_VERSION']
+        user_domain_name      ENV['OS_USER_DOMAIN_NAME']
+        project_domain_name   ENV['OS_PROJECT_DOMAIN_NAME']
+        debug                 ENV['YAO_DEBUG']
+        debug_record_response ENV['YAO_DEBUG_RECORD_RESPONSE']
+      end
+
+      if script_mode
+        script_file = script_mode.first
+        load script_file
+      else
+        IRB.setup('yao')
+        IRB.conf[:PROMPT] = { :YAO => {
+          :PROMPT_I => 'yao(%m):%03n:%i> ',
+          :PROMPT_N => 'yao(%m):%03n:%i> ',
+          :PROMPT_S => 'yao(%m):%03n:%i%l ',
+          :PROMPT_C => 'yao(%m):%03n:%i* ',
+            :RETURN => "=> %s\n",
+        }}
+        IRB.conf[:PROMPT_MODE]  = :YAO
+        IRB.conf[:SAVE_HISTORY] = 1000
+        IRB.conf[:HISTORY_FILE] = File.expand_path('~/.yrb_history')
+        IRB::Irb.new.run(IRB.conf)
+      end
+
+    end
+  end
+end

data/lib/yao/yrb/version.rb

@@ -1,5 +1,5 @@
 module Yao
   module Yrb
-    VERSION = '1.0.0'
+    VERSION = '2.0.0'
   end
 end

data/lib/yao/yrb.rb

@@ -1,39 +1,6 @@
-require 'irb'
-require 'irb/completion'
-require 'irb/ext/save-history'
-
-require 'yao'
+require 'yao/yrb/cli'
 
 module Yao
   module Yrb
-    def self.run
-      Yao.configure do
-        auth_url              ENV['OS_AUTH_URL']
-        tenant_name           ENV['OS_TENANT_NAME']
-        username              ENV['OS_USERNAME']
-        password              ENV['OS_PASSWORD']
-        client_cert           ENV['OS_CERT']
-        client_key            ENV['OS_KEY']
-        region_name           ENV['OS_REGION_NAME']
-        identity_api_version  ENV['OS_IDENTITY_API_VERSION']
-        user_domain_name      ENV['OS_USER_DOMAIN_NAME']
-        project_domain_name   ENV['OS_PROJECT_DOMAIN_NAME']
-        debug                 ENV['YAO_DEBUG']
-        debug_record_response ENV['YAO_DEBUG_RECORD_RESPONSE']
-      end
-
-      IRB.setup('yao')
-      IRB.conf[:PROMPT] = { :YAO => {
-        :PROMPT_I => 'yao(%m):%03n:%i> ',
-        :PROMPT_N => 'yao(%m):%03n:%i> ',
-        :PROMPT_S => 'yao(%m):%03n:%i%l ',
-        :PROMPT_C => 'yao(%m):%03n:%i* ',
-          :RETURN => "=> %s\n",
-      }}
-      IRB.conf[:PROMPT_MODE]  = :YAO
-      IRB.conf[:SAVE_HISTORY] = 1000
-      IRB.conf[:HISTORY_FILE] = File.expand_path('~/.yrb_history')
-      IRB::Irb.new.run(IRB.conf)
-    end
   end
 end

data/yao-yrb.gemspec

@@ -35,6 +35,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'yao'
+  spec.add_dependency 'clamp', '~> 1.3.1'
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yao-yrb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Yuki Koya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-07 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yao
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: clamp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -78,7 +92,6 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -86,6 +99,7 @@ files:
 - bin/setup
 - exe/yrb
 - lib/yao/yrb.rb
+- lib/yao/yrb/cli.rb
 - lib/yao/yrb/version.rb
 - yao-yrb.gemspec
 homepage: https://github.com/buty4649/yao-yrb

data/Gemfile.lock

@@ -1,33 +0,0 @@
-PATH
-  remote: .
-  specs:
-    yao-yrb (0.1.0)
-      yao
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    faraday (0.15.4)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.13.1)
-      faraday (>= 0.7.4, < 1.0)
-    json (2.2.0)
-    minitest (5.11.3)
-    multipart-post (2.1.1)
-    rake (10.5.0)
-    yao (0.6.3)
-      faraday
-      faraday_middleware
-      json
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 2.0)
-  minitest (~> 5.0)
-  rake (~> 10.0)
-  yao-yrb!
-
-BUNDLED WITH
-   2.0.2