starenv 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f62c737f6641cc377942b154fa174a519839e523
-  data.tar.gz: 8702d7433c99c1037320c1b6fc1ab50c964e1849
+  metadata.gz: 7376688a18f0a2a550a90d94cb28bac78c62a499
+  data.tar.gz: 63adad010a428cc1d3763c40c9d426ba64836740
 SHA512:
-  metadata.gz: ead64a5864fefa2c6659ced490b2f57b624252b119099286632434450a6704b1fab68fad081aa32bf5970d9413cbdf1473d5c4911fcdfad52a118329f10c2604
-  data.tar.gz: 1886d2735b635cf18ca05fa9a3102db31da3bd0b6da49da12ff68efc7dbbffa2d68f920188e2ff63dc93283194764f04f3f1c01a497e43077afb6240baebf661
+  metadata.gz: c4e433ce4d2f660f77700e402614c637dc9261717bdcc7428f221577ac80344bbcbfae7c8e6859185f7fe01842e63cc159dee6e3fcb762b2b27e555695604780
+  data.tar.gz: 5bb6f10d5c1c03daddfa992771bfe87419c3ca8278cdd04e80d4e0ea74b02cb3a60aed5489faf2f86229d83f00a5035f5c0bb6c61c4b849a1ed13f885df32a57

data/lib/starenv/environment.rb

@@ -26,18 +26,26 @@ module Starenv
       self[key] and not self[key].to_s.empty?
     end
 
-    def apply(hash)
+    def apply(other)
       self.tap do |env|
-        hash.each do |key, value|
+        other.each do |key, value|
           if has_key? key
-            @ignored[key] = value
+            ignore!(key, value) and other.ignore!(key, value)
           else
-            self[key], @applied[key] = value, value
+            apply!(key, value) and other.apply!(key, value)
           end
         end
       end
     end
 
+    def ignore!(key, value)
+      @ignored[key] = value
+    end
+
+    def apply!(key, value)
+      self[key], @applied[key] = value, value
+    end
+
     def respond_to_missing?(method)
       @source.respond_to?(method) or super
     end

data/lib/starenv/file/node.rb

@@ -1,10 +1,12 @@
 require 'starenv/file'
+require 'starenv/environment'
 
 module Starenv
   class File < ::File
     class Node < Struct.new(:name, :dependencies, :hook)
 
-      attr_reader :environment
+      attr_accessor :loaded
+      attr_reader :environment, :file
 
       def initialize(name, dependencies = [], hook = nil)
         super name, dependencies, hook
@@ -18,20 +20,37 @@ module Starenv
 
       def load!
         tap do
-          @environment = (hook || default_hook).call self do
-            File.parse(name).environment
-          end
+          @file = File.new(name)
+          @environment = Loader.new(self, hook).call
         end
       end
 
       def loaded?
-        !!@environment
+        !!loaded
       end
 
     private
 
-      def default_hook
-        @@default_hook ||= -> file, &loader { loader.call }
+      class Loader < Struct.new(:node, :hook)
+
+        def initialize(node, hook = nil)
+          super node, hook || default_hook
+        end
+
+        def load
+          node.file.parse.environment.tap do
+            node.loaded = true
+          end
+        end
+
+        def call
+          instance_exec node, &hook or Environment.new({})
+        end
+
+        def default_hook
+          @@default_hook ||= -> (node) { load }
+        end
+
       end
 
     end

data/lib/starenv/file/template.rb

@@ -15,7 +15,6 @@ module Starenv
       def parse
         tap do
           unless parsed?
-            require 'pry'; binding.pry
             @files = Hash[
               read.split(header).drop(1).each_slice(2).map do |key, value|
                 [ key.to_sym, Parser.new(value.strip.lines).call ]

data/lib/starenv/tasks.rb

@@ -55,7 +55,7 @@ module Starenv
 
     def init_from(template: :example, noop: false, verbose: true)
       File::Template.touch(template, noop: noop, verbose: verbose).parse.files.each do |file, env|
-        require 'pry'; binding.pry
+        # require 'pry'; binding.pry
       end
     end
 
@@ -78,15 +78,15 @@ module Starenv
     # end
 
     def new_variable(name:, value:, file: Starenv.files.tsort.last || :core)
-      file = EnvFile.new(file, [], pattern, nil)
+      # file = EnvFile.new(file, [], pattern, nil)
     end
 
     def set_variable(name, value:, file: Starenv.files.tsort.last || :core)
-      file = EnvFile.new(file, [], pattern, nil)
+      # file = EnvFile.new(file, [], pattern, nil)
     end
 
     def get_variable(name, value:, file: Starenv.files.tsort.last || :core)
-      file = EnvFile.new(file, [], pattern, nil)
+      # file = EnvFile.new(file, [], pattern, nil)
     end
 
   private

data/lib/starenv.rb

@@ -27,8 +27,11 @@ module Starenv
   end
 
   def load(env = nil)
-    files.tsort.reduce(Environment.new(env)) do |environment, node|
-      environment.apply files[node].load.environment
+    files.tsort.reduce(Environment.new(env)) do |environment, name|
+      node = files[name].load
+      environment.apply(node.environment).tap do |environment|
+        puts info node if node.loaded?
+      end
     end
   end
 
@@ -38,4 +41,63 @@ private
     'envs/%s.env'
   end
 
+  def info(node)
+    longest = node.environment.variables.keys.group_by(&:size).max
+    length = longest.nil? ? 0 : longest.first
+    [
+      Results.for(:applied).new(node.file.filename, node.environment.applied, length),
+      Results.for(:ignored).new(node.file.filename, node.environment.ignored, length),
+    ].map(&:to_s).compact.push("\n").join("\n")
+  end
+
+  class Results < Struct.new(:filename, :variables, :name_length)
+
+    class << self
+      def for(type)
+        const_get type.to_s.capitalize
+      end
+    end
+
+    def display
+      formatted(variables).unshift(header).join("\n") unless variables.empty?
+    end
+
+    def to_s
+      display or ''
+    end
+
+  private
+
+    def formatted(variables)
+      variables.map do |name, value|
+        format_variable name, value
+      end
+    end
+
+    class Applied < self
+
+      def header
+        "Applied variables from #{filename}:"
+      end
+
+      def format_variable(name, value)
+        format "  %-#{name_length}s => %s", name, value
+      end
+
+    end
+
+    class Ignored < self
+
+      def header
+        'Ignored already set variables:'
+      end
+
+      def format_variable(name, value)
+        format "  %-#{name_length}s => %s\n   %-#{length-1}s => %s", name, value, 'already', ENV[name]
+      end
+
+    end
+
+  end
+
 end

data/starenv.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "starenv"
-  spec.version       = '0.0.2'
+  spec.version       = '0.0.3'
   spec.authors       = ["Chris Keele"]
   spec.email         = ["dev@chriskeele.com"]
   spec.summary       = 'Load and manage suites of environment variables.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: starenv
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Chris Keele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -81,7 +81,6 @@ files:
 - Rakefile
 - bin/rake
 - lib/starenv.rb
-- lib/starenv/env_file.rb
 - lib/starenv/environment.rb
 - lib/starenv/file.rb
 - lib/starenv/file/node.rb

data/lib/starenv/env_file.rb

@@ -1,85 +0,0 @@
-require 'starenv/results'
-
-class EnvFile < Struct.new(:name, :dependencies, :pattern, :hook)
-
-  def load
-    (hook || default_hook).call self do
-      Dotenv.load(filename).tap do |results|
-        puts info results
-      end
-    end
-  end
-
-  def filename
-    format pattern, name
-  end
-
-  alias_method :to_s, :filename
-
-  def info(results)
-    longest = results.keys.group_by(&:size).max
-    length = longest.nil? ? 0 : longest.first
-    applied, ignored = results.partition do |key, value|
-      ENV[key] == value
-    end
-    [
-      Results.for(:applied).new(self, applied, length),
-      Results.for(:ignored).new(self, ignored, length),
-    ].map(&:to_s).compact.push("\n").join("\n")
-  end
-
-private
-
-  @@default_hook = -> file, &loader { loader.call }
-
-  def default_hook
-    @@default_hook
-  end
-
-  module Utils
-
-    def without_leading_comments(file)
-      file.each_line.drop_while do |line|
-        comment? line
-      end
-    end
-
-    def comment?(line)
-      line.start_with? '#'
-    end
-
-    def variable(line)
-      line.match(/^\s*?(?<name>\b.*\b)=(?<value>\b\S*\b)?\s*?$/)
-    end
-
-  end
-
-  class Template < self
-
-    include Utils
-
-    attr_reader :content
-
-    def initialize(name, pattern =  Starenv.pattern, content = [])
-      @content = content
-      super name, [], pattern, nil
-    end
-
-    def parse
-      File.open(filename) do |lines|
-        yield without_leading_comments lines
-      end
-    end
-
-    def write
-      File.open(filename, 'w') do |file|
-        content.each do |line|
-          line = yield line
-          file.puts line if line
-        end
-      end
-    end
-
-  end
-
-end