nymphia 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d02e3f927f6d4e7cdf4505b72a1fbaa1760342a
-  data.tar.gz: db1ae7d917cf15c3800a2ba3be7d7720faf076ce
+  metadata.gz: 3e63af421a0ea05d92b9373afb3ec820b48926c1
+  data.tar.gz: e78bc17a8c1f2ea1783408968d8c3630adaafcc0
 SHA512:
-  metadata.gz: 45a19907f3dac299fb5ff4e926c061867232c86a2d34c426b3e7b363a2492f51d485c56ccf9141add987bd39ecf5a9dff6b2edab2f5480f52411e6ae2c7fc65c
-  data.tar.gz: 777918ccfd4faa833c96a556aef1d624852ca652b98db4a48e6ea0cfe1c6ac4b56b79d2d8d81712c76b5d05e3e856b5cb0c85486157e04110004d1ceda96ff1f
+  metadata.gz: 45cc06ed31ce52ebba9f4b1ea366943f4fc208528bec9f7c146d4ec32213081f0f0f737965be47dfc12b7e352d550c5a31524c44cf82907e81e1d462dafa03e0
+  data.tar.gz: 1ed0a913d24959116dde40454f96adf2ee3dfa97e150b11bbff5830ae6759bf9b2ab236e2de320e1bdde8afbfb5c6ea415bec681be8d6076c4d9aabc3f0130b4

data/README.md

@@ -35,19 +35,20 @@ identity_file :private, '~/.ssh/id_rsa.1'
 
 my_server_port = 4321
 
-host 'alice', 'my server on VPS' do
+host('alice', 'my server on VPS') {
   hostname 'alice.example.com'
   user 'alice'
   port my_server_port
   use_identify_file :private
-end
+}
 ```
 
 Following ssh config file is generated after the code is compiled.
 
 ```
 #
-# This config is generated by Nymphia 0.1.1
+# This config is generated by Nymphia 0.1.2
+# @ 2017-12-08T16:34:15+09:00
 #
 
 # my server on VPS
@@ -64,19 +65,21 @@ Method `host` generate `Host` directive. First argument is name of host, Second
 
 ### Splitting files
 
-You can use `load` method to load other Nymphia file like following example. Absolute path and relative path are acceptable as the file path.
+You can use `include_file` method to include other Nymphia file like following example. Absolute path and relative path are acceptable as the file path.
+
+We could use `load` in previous version, but `load` is obsoleted now.
 
 ```ruby
 identity_file :private, '~/.ssh/id_rsa.1'
 
-host 'alice', 'my server on VPS' do
+host('alice', 'my server on VPS') {
   hostname 'alice.example.com'
   user 'alice'
   port 4321
   use_identify_file :private
-end
+}
 
-load 'other_nymphia_file.rb'
+include_file 'other_nymphia_file.rb'
 ```
 
 ### Proxy method
@@ -86,7 +89,7 @@ Method `proxy` is almost same to `host`, but `local_forward` method can be used
 ```ruby
 identity_file :company_gateway, '~/.ssh/id_rsa.company.gw'
 
-proxy 'awsproxy.company.apne1' do
+proxy('awsproxy.company.apne1') {
   hostname 'gw.apne1.example.com'
   user 'alice'
   port 19822
@@ -105,14 +108,15 @@ proxy 'awsproxy.company.apne1' do
     'localhost' => 10389,
     'ldap.apne.aws.example.com' => 398,
   }
-end
+}
 ```
 
 Following ssh config file is generated after the code is compiled.
 
 ```
 #
-# This config is generated by Nymphia 0.1.1
+# This config is generated by Nymphia 0.1.2
+# @ 2017-12-08T16:34:15+09:00
 #
 
 Host awsproxy.company.apne1
@@ -133,31 +137,31 @@ Nymphia has `group` and `gateway` method to make ssh config more structurally. F
 identity_file :company, '~/.ssh/id_rsa.company'
 identity_file :company_gateway, '~/.ssh/id_rsa.company.gw'
 
-gateway 'company.gateway' do
+gateway('company.gateway') {
   hostname 'gw.example.com'
   user 'alice'
   port 19822
-end
+}
 
-group 'company.ap-northeast-1' do
+group('company.ap-northeast-1') {
   use_gateway 'company.gateway'
 
-  default_params do
+  default_params {
     check_host_ip 'no'
     strict_host_key_checking 'no'
     user 'alice'
     port 9822
     use_identify_file :company, :company_gateway
-  end
+  }
 
-  host '*.apne.aws.example.com'
+  host('*.apne.aws.example.com')
 
-  host 'alice.apne.aws.example.com' do
+  host('alice.apne.aws.example.com') {
     hostname '10.16.16.16'
     user 'white_rabbit'
     port 7777
-  end
-end
+  }
+}
 ```
 
 Following ssh config file is generated after the code is compiled.
@@ -165,7 +169,8 @@ Following ssh config file is generated after the code is compiled.
 ```
 
 #
-# This config is generated by Nymphia 0.1.1
+# This config is generated by Nymphia 0.1.2
+# @ 2017-12-08T16:34:15+09:00
 #
 
 Host company.gateway

data/examples/base.rb

@@ -2,18 +2,18 @@ identity_file :private, '~/.ssh/id_rsa.1'
 
 my_server_port = 4321
 
-host 'alice', 'my server on VPS' do
+host('alice', 'my server on VPS') {
   hostname 'alice.example.com'
   user 'alice'
   port my_server_port
   use_identify_file :private
-end
+}
 
-host 'queen', 'NAS in my home network' do
+host('queen', 'NAS in my home network') {
   hostname '172.16.16.3'
   user 'alice'
   port my_server_port
   use_identify_file :private
-end
+}
 
-load 'company.rb'
+include_file 'company.rb'

data/examples/company.rb

@@ -2,33 +2,33 @@ identity_file :company, '~/.ssh/id_rsa.company'
 identity_file :company_gateway, '~/.ssh/id_rsa.company.gw'
 identity_file :company_internal, '~/.ssh/id_rsa.company.in'
 
-gateway 'company.gateway', 'Gateway saerver of my company' do
+gateway('company.gateway', 'Gateway saerver of my company') {
   hostname 'gw.example.com'
   user 'alice'
   port 19822
-end
+}
 
-group 'company.ap-northeast-1' do
+group('company.ap-northeast-1') {
   use_gateway 'company.gateway'
 
-  default_params do
+  default_params {
     check_host_ip 'no'
     strict_host_key_checking 'no'
     user 'alice'
     port 9822
     use_identify_file :company, :company_gateway
-  end
+  }
 
-  host '*.apne.aws.example.com'
+  host('*.apne.aws.example.com')
 
-  host 'alice.apne.aws.example.com' do
+  host('alice.apne.aws.example.com') {
     hostname '10.16.16.16'
     user 'white_rabbit'
     port 7777
-  end
-end
+  }
+}
 
-proxy 'awsproxy.company.apne1' do
+proxy('awsproxy.company.apne1') {
   hostname 'gw.apne1.example.com'
   user 'alice'
   port 19822
@@ -47,8 +47,8 @@ proxy 'awsproxy.company.apne1' do
     'localhost' => 10389,
     'ldap.apne.aws.example.com' => 398,
   }
-end
+}
 
-host 'ghe.company.example.com' do
+host('ghe.company.example.com') {
   use_identify_file :company_internal
-end
+}

data/examples/result.example

@@ -1,5 +1,6 @@
 #
-# This config is generated by Nymphia 0.1.1
+# This config is generated by Nymphia 0.1.2
+# @ 2017-12-08T16:34:15+09:00
 #
 
 # my server on VPS

data/lib/nymphia/dsl/context.rb

@@ -37,6 +37,11 @@ class Nymphia::DSL::Context
   end
 
   def load(load_file_path)
+    warn "#{caller[0]}: #load method is obsolated. Use #include_file"
+    include_file(load_file_path)
+  end
+
+  def include_file(load_file_path)
     absolute_load_file_path = Pathname.new(@path).dirname.join(load_file_path)
     dsl_code = File.read(absolute_load_file_path)
 

data/lib/nymphia/version.rb

@@ -1,3 +1,3 @@
 module Nymphia
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nymphia
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - mozamimy (Moza USANE)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2018-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler