grably 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0a6b73759c81fdcf51a74419ad2623872f6d1a11e369668ff3cfcd79d349d20
-  data.tar.gz: 966bda27069001e502742cadb4ecea0a5ece85cc7ff149b4647468c4024d450e
+  metadata.gz: bf9742abda95d9380b462abfc4bb89378731258c0be527b2a3423088496232e0
+  data.tar.gz: 7861cf271dac8f6ca0bbec669fa25c4ca5b76bf9b3b88d2428abddd40a796b36
 SHA512:
-  metadata.gz: 851a9f4b2da3543a59a4ad9ba04f2314dc97b25587534886372d5febd384fd745dc9d8feaa0504c8f64e65b153705b14a43ace8c9360aafb5e10fea4c8198f83
-  data.tar.gz: 8f9c76709d59efd2a016784bff9c6ddf38c9dabbe4b474b78be316cf76e04983af191ebc009abd8482256a7dfe7d05a95470d5fd08725ab20f6e8d602619894a
+  metadata.gz: fd7ba5ea17f663a65e15ed6b7bde8c1711d019e02fc33d6631254e8d081a86f98a66d127abefdedcea7d98b8a2d8a335628cc30af3dd902edff16fdcd376a6ae
+  data.tar.gz: 45de64bc16029816e57839a7aa7a49db3a2b09da54f8dd5176f97cc3729741264ad178b24d17dbeee8ee6d548e85599f3d5c7ea8e048e47f2bd6a0425cfd30fa

data/lib/grably.rb

@@ -14,11 +14,6 @@ module Grably
                   '/_/   \____/_/   \__,_/_.___/_/\__, (_)   |' \
                   '                              /____/      |'.tr('|', "\n")
 
-  # Key where required profile is placed.
-  # To load grably with profile `foo,bar` one need to
-  # run `rake mp=foo,bar task1, task2, ... taskN`
-  ENV_PROFILE_KEY = 'mp'.freeze
-
   def config
     Grably.config
   end
@@ -31,9 +26,7 @@ module Grably
   class << self
     attr_reader :config
     def init
-      profile = (ENV[ENV_PROFILE_KEY] || 'default').split(',')
-      puts 'Loding profile ' + profile.join('/')
-      @config = Grably::Core::Configuration.load(profile)
+      @config = Grably::Core::Configuration.load
     end
 
     def server

data/lib/grably/cli.rb

@@ -3,7 +3,7 @@ require 'rake'
 require 'yaml'
 
 require_relative 'version'
-
+require_relative 'core/configuration'
 module Grably
   # Grably CLI tool. Gives access to basic grably commands. Allowing to fetch
   # basic infromation about build configuration, grably version and much more
@@ -12,8 +12,8 @@ module Grably
     map %w(--version -v) => :version
     map %w(x) => :exec
 
-    desc 'exec ...TASKS', 'Execute build tasks'
     option :profile, type: :string, default: 'default', aliases: :'-p', banner: '<profile>'
+    desc 'exec ...TASKS', 'Execute build tasks'
     def exec(*tasks)
       Rake.application.run(tasks + ["mp=#{options[:profile]}"])
     end
@@ -26,11 +26,11 @@ module Grably
       Rake.application.run(args)
     end
 
+    option :profile, type: :string, aliases: :'-p', banner: '<profile>'
     desc 'config', 'Pretty print current configuration'
-    option :profile, type: :string, default: 'default', aliases: :'-p', banner: '<profile>'
     def config
       app = Rake.application
-      app.init
+      ENV[Grably::ENV_PROFILE_KEY] = options[:profile]
       app.load_rakefile
       Grably.config.pretty_print
     end

data/lib/grably/core/configuration.rb

@@ -10,6 +10,14 @@ module Grably
     # We use jac for configuration
     # @see https://github.com/vizor-games/jac
     module Configuration
+      # Key where required profile is placed.
+      # To load grably with profile `foo,bar` one need to
+      # run `rake mp=foo,bar task1, task2, ... taskN`
+      ENV_PROFILE_KEY = 'mp'.freeze
+
+      # Key where binary configuration stored if any
+      ENV_BINCONFIG_KEY = 'BIN_CONFIG'.freeze
+
       # Default configuration file names
       CONFIGURATION_FILES = %w(grably.yml grably.user.yml grably.override.yml).freeze
 
@@ -21,17 +29,55 @@ module Grably
         # names to read
         # @return [OpenStruct] instance which contains all resolved profile fields
         def read(profile, *streams)
-          Jac::Configuration.read(profile, *streams)
+          obj = Jac::Configuration.read(profile, *streams)
+          obj.extend(self)
+          obj
         end
 
         # Read configuration from configuration files.
         # @praram [String or Array] profile which should be loaded
         # @param [String] dir base directory path for provided files may be nil
         # @return [OpenStruct] resolved profile values
-        def load(profile, dir: nil)
-          obj = Jac::Configuration.load(profile, files: CONFIGURATION_FILES, dir: dir)
-          obj.extend(self)
-          obj
+        def load(dir: nil, profile: [])
+          profile += (ENV[ENV_PROFILE_KEY] || 'default').split(',')
+          puts 'Loding profile ' + profile.join('/')
+          read(profile, *load_configuration_streams(dir))
+        end
+
+        def load_configuration_streams(dir)
+          # Read all known files
+          streams = CONFIGURATION_FILES
+                    .map { |f| [dir ? File.join(Dir.pwd, f) : f, f] }
+                    .select { |path, _name| File.exist?(path) }
+                    .map { |path, name| [IO.read(path), name] }
+
+          streams << bin_config if bin_config?
+          streams
+        end
+
+        # Reads binary configuration as YAML configuration stream so it could
+        # be merged with other streams
+        def bin_config
+          data = hex_to_string ENV[ENV_BINCONFIG_KEY]
+          # Data will be walid YAML string. Trick is ident its contend and
+          # attach to ^top profile
+          [
+            "^top:\n" + data.split("\n").map { |x| '  ' + x }.join("\n"),
+            ENV_BINCONFIG_KEY
+          ]
+        end
+
+        # Converts hex string representation to plain string
+        # @see https://en.wikipedia.org/wiki/Hexadecimal
+        def hex_to_string(str)
+          str.each_char.each_slice(2).inject('') do |acc, elem|
+            acc + elem.map(&:chr).inject(&:+).hex.chr
+          end
+        end
+
+        # Tells if binary configuration is provided
+        def bin_config?
+          ENV[ENV_BINCONFIG_KEY]
         end
       end
     end

data/lib/grably/version.rb

@@ -1,7 +1,7 @@
 module Grably # :nodoc:
   class << self
     # Current grably version identifier
-    VERSION = [0, 0, 2].freeze
+    VERSION = [0, 0, 3].freeze
 
     # Returns grably version string
     # @return [String] version string

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grably
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ilya Arkhanhelsky
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement