opto 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 469818920f19b0aa498df43ef2a9bb9efe13aa34
-  data.tar.gz: 78c94e65c48b602d14346252c015061fe78a3881
+  metadata.gz: a9f0ef7542d31a0ad7e239c0cb806b8043fbf180
+  data.tar.gz: 7c8f9cce7e8f4e72ab1e5e5a02e2b7db6ce1e2ad
 SHA512:
-  metadata.gz: ce178466bf44aa9d757db6753ff1b9976aaaafa303c31af143008281e06b8496ae9841d6af19b81d28f6f789df1b4d585d7ceb4accd1145a103b82c8ae1f403b
-  data.tar.gz: 34273a61230708482fc5067b8d985be327e1fa90fbe8d6c40c29e8112971bcca11bbc3f278ee6446461019aa49c703c286c09cf6a0db21058aba5593df4d57a5
+  metadata.gz: 9308afe78c8546a80374aa50001cb6c2db6b16844a0fbf34bc13965da43dce0348a6cec1ba8c383021ae84f4f7e99f7786c692d396c249fd661b4bbb0eeda9e9
+  data.tar.gz: 99d48baecaea59a3d1cffad818fc3799c9d2c36eef1df0a6b311448cca96fc3d409220f3cf687b0d542f732311ce40e878590712faa5f986cd20d8087c03387b

data/README.md

@@ -393,6 +393,45 @@ Ignores hint completely.
 
 Output is a 'random' UUID generated by `SecureRandom.uuid`, such as `78b6decf-e312-45a1-ac8c-d562270036ba`
 
+### evaluate
+Hint is a calculation. Uses values of other options to perform simple calculations.
+
+Example:
+
+```yaml
+apples:
+  type: integer
+  value: 2
+
+bananas:
+  type: integer
+  value: 1
+
+fruits:
+  type: integer
+  from:
+    evaluate: ${apples} + ${bananas}
+
+# group.value_of('fruits') => 3
+
+### interpolate
+Hint is a template. Uses values from other options to build a string.
+
+Example:
+
+```yaml
+place:
+  type: string
+  value: world
+
+greeting:
+  type: string
+  from:
+    interpolate: Hello, ${place}!
+
+# group.value_of('greeting') => "Hello, world!"
+```
+
 ## Default setters
 
 ### env

data/lib/opto/option.rb

@@ -157,6 +157,7 @@ module Opto
     # Get a value of another Opto::Group member
     # @param [String] option_name
     def value_of(option_name)
+      return value if option_name == self.name
       group.nil? ? nil : group.value_of(option_name)
     end
 

data/lib/opto/resolvers/evaluate.rb

@@ -0,0 +1,38 @@
+require 'opto/extensions/snake_case'
+require 'opto/extensions/hash_string_or_symbol_key'
+
+if RUBY_VERSION < '2.1'
+  using Opto::Extension::SnakeCase
+  using Opto::Extension::HashStringOrSymbolKey
+end
+
+module Opto
+  module Resolvers
+    # Geneerate a new random number. Requires :min and :max in hint to define range.
+    class Evaluate < Opto::Resolver
+
+      using Opto::Extension::HashStringOrSymbolKey unless RUBY_VERSION < '2.1'
+
+      def resolve
+        raise TypeError, "String required" unless hint.kind_of?(String)
+        interpolated_hint = hint.gsub(/(?<!\$)\$(?!\$)\{?\w+\}?/) do |v|
+          var = v.tr('${}', '')
+          if option.group.nil? || option.group.option(var).nil?
+            raise RuntimeError, "Variable #{var} not declared"
+          end
+          if option.value_of(var).nil?
+            raise RuntimeError, "No value for #{var}, note that the order is meaningful"
+          end
+          option.value_of(var)
+        end.gsub(/\s+/, "")
+
+        if interpolated_hint =~ /\A[\(\)\-\+\/\*0-9\.]+\z/
+          eval(interpolated_hint)
+        else
+          raise TypeError, "Syntax error: '#{interpolated_hint}' does not look like a number or a calculation"
+        end
+      end
+    end
+  end
+end
+

data/lib/opto/resolvers/interpolate.rb

@@ -0,0 +1,35 @@
+require 'opto/extensions/snake_case'
+require 'opto/extensions/hash_string_or_symbol_key'
+
+if RUBY_VERSION < '2.1'
+  using Opto::Extension::SnakeCase
+  using Opto::Extension::HashStringOrSymbolKey
+end
+
+module Opto
+  module Resolvers
+    # Interpolates values from other options into a template string.
+    #
+    # Example:
+    # from:
+    #   interpolate: mysql://admin:$mysql_admin_pass@mysql:1234/$mysql_db_name
+    class Interpolate < Opto::Resolver
+
+      using Opto::Extension::HashStringOrSymbolKey unless RUBY_VERSION < '2.1'
+
+      def resolve
+        raise TypeError, "String expected" unless hint.kind_of?(String)
+        hint.gsub(/(?<!\$)\$(?!\$)\{?\w+\}?/) do |v|
+          var = v.tr('${}', '')
+          if option.group.nil? || option.group.option(var).nil?
+            raise RuntimeError, "Variable #{var} not declared"
+          end
+          if option.value_of(var).nil?
+            raise RuntimeError, "No value for #{var}, note that the order is meaningful"
+          end
+          option.value_of(var)
+        end
+      end
+    end
+  end
+end

data/lib/opto/version.rb

@@ -1,3 +1,3 @@
 module Opto
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opto
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Kimmo Lehto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,7 +74,9 @@ files:
 - lib/opto/resolver.rb
 - lib/opto/resolvers/default.rb
 - lib/opto/resolvers/environment_variable.rb
+- lib/opto/resolvers/evaluate.rb
 - lib/opto/resolvers/file_content.rb
+- lib/opto/resolvers/interpolate.rb
 - lib/opto/resolvers/random_number.rb
 - lib/opto/resolvers/random_string.rb
 - lib/opto/resolvers/random_uuid.rb