filegen 0.3.1 → 0.4.0

data/README.md

@@ -26,7 +26,7 @@ Or install it yourself as:
 This gem ships with an executable called `filegen`. It makes the power of ERB
 available on the commandline.
 
-## Usage
+## Usage on Commandline
 
 ### General advice
 
@@ -127,6 +127,48 @@ And get the following result.
 Hello my name is: Karl
 ```
 
+## Usage within ruby
+
+### Hash with Symbol-Keys
+
+```ruby
+require 'filegen'
+require 'stringio'
+
+template = <<-EOS
+Hi <%= lookup('name') %>
+EOS
+
+data = {
+  name: 'Karl'
+}
+
+generator = Filegen::Rubygen.new
+puts generator.run(template, data)
+
+# => Hi Karl
+```
+
+### Hash with String-Keys
+
+```ruby
+require 'filegen'
+require 'stringio'
+
+template = <<-EOS
+Hi <%= lookup('name') %>
+EOS
+
+data = {
+  'name' => 'Karl'
+}
+
+generator = Filegen::Rubygen.new
+puts generator.run(template, data)
+
+# => Hi Karl
+```
+
 ## Use Cases
 
 ### RPM packaging
@@ -162,8 +204,7 @@ chmod +x <wrapper>
 
 ## Future
 
-* Maybe I will add additional data sources. Please see the
-  [Moneta](https://github.com/minad/moneta)-gem for possible candidates.
+* Maybe I will add additional data sources.
 
 ## Contributing
 

data/Rakefile

@@ -1,7 +1,9 @@
 #!/usr/bin/env rake
 
-require 'fedux_org/stdlib/rake'
+require 'bundler'
+Bundler.require :default, :test, :development
 
+require 'fedux_org/stdlib/rake'
 require 'filegen/version'
 
 def software

data/config/rubocop-enabled.yml

@@ -100,8 +100,8 @@ SpaceAfterControlKeyword:
 SpaceAfterNot:
   Enabled: true
 
-SpaceAroundBlockBraces:
-  Enabled: true
+#SpaceAroundBlockBraces:
+#  Enabled: true
 
 SpaceAroundEqualsInParameterDefault:
   Enabled: true

data/features/step_definitions.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-Then /then environment contains the following variables/ do
+Then(/then environment contains the following variables/) do
   $stderr.printf("%20s | %-20s\n", 'key', 'value')
   $stderr.printf("%20s+%-20s\n", '-' * 21 , '-' * 21)
 

data/filegen.gemspec

@@ -17,6 +17,4 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
-
-  spec.add_runtime_dependency 'moneta'
 end

data/lib/filegen.rb

@@ -1,10 +1,11 @@
 # encoding: utf-8
 require 'erb'
-require 'moneta'
 require 'optparse'
 require 'forwardable'
 require 'ostruct'
 require 'logger'
+require 'active_support/hash_with_indifferent_access'
+require 'stringio'
 
 require 'filegen/version'
 require 'filegen/ui'
@@ -15,6 +16,7 @@ require 'filegen/erb_generator'
 require 'filegen/data_source_builder'
 require 'filegen/data_sources/environment'
 require 'filegen/data_sources/yaml'
+require 'filegen/rubygen'
 require 'filegen/exceptions'
 
 # Main class

data/lib/filegen/data_sources/environment.rb

@@ -1,20 +1,22 @@
 # encoding: utf-8
 module Filegen
+  # Data Sources
   module DataSources
     # Data source which makes environment variables available
     class Environment
-      extend Forwardable
+      private
 
-      # @!method fetch(key, default_value=nil)
-      #    Fetch value for key from data source
-      def_delegator :@source, :fetch, :fetch
+      attr_reader :source
+
+      public
 
       # Create data source
       def initialize
-        @source = Moneta.build do
-          use :Transformer, key: :to_s, value: []
-          adapter :Memory, backend: ENV
-        end
+        @source = HashWithIndifferentAccess.new(ENV.to_hash)
+      end
+
+      def fetch(key, default_value = nil)
+        source[key.to_sym] || source[key.to_s] || default_value
       end
     end
   end

data/lib/filegen/data_sources/yaml.rb

@@ -1,17 +1,24 @@
 # encoding: utf-8
 module Filegen
+  # Data Sources
   module DataSources
     # Data source which makes yaml files available
     class Yaml
-      extend Forwardable
+      private
 
-      # @!method fetch(key, default_value=nil)
-      #    Fetch value for key from data source.
-      def_delegator :@source, :fetch, :fetch
+      attr_reader :source
+
+      public
 
       # Create data source
       def initialize(file)
-        @source = Moneta.new(:YAML, file: file)
+        @source = HashWithIndifferentAccess.new(Psych.load_file(file))
+      rescue
+        @source = HashWithIndifferentAccess.new
+      end
+
+      def fetch(key, default_value = nil)
+        source[key.to_sym] || source[key.to_s] || default_value
       end
     end
   end

data/lib/filegen/options.rb

@@ -102,7 +102,7 @@ module Filegen
     end
 
     def exists?
-      File.exists?(params.template)
+      File.exist?(params.template)
     end
 
     def erb_template?

data/lib/filegen/rubygen.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+module Filegen
+  # Generator for ruby code
+  class Rubygen
+    # Generate text
+    #
+    # @param [String] source
+    #   The template used
+    # @param [Hash] data
+    #   The data used within template evaluation
+    # @return [String]
+    #   The evaluated template
+    def run(source, data)
+      result = StringIO.new
+      source = StringIO.new(source)
+
+      begin
+        generator = ErbGenerator.new(Data.new([HashWithIndifferentAccess.new(data)]))
+        generator.compile(source, result)
+      rescue RuntimeError => e
+        Filegen::Ui.error e.message
+      rescue Exceptions::ErbTemplateHasSyntaxErrors => e
+        Filegen::Ui.error "Syntax error in ERB-Template: \n" + e.message
+      end
+
+      result.string
+    end
+  end
+end

data/lib/filegen/ui.rb

@@ -9,7 +9,7 @@ module Filegen
 
       def formated_logger
         logger.formatter = proc { |severity, datetime, _, msg|
-          sprintf("%s %s: %s\n", datetime, severity, msg)
+          format("%s %s: %s\n", datetime, severity, msg)
         }
 
         logger

data/lib/filegen/version.rb

@@ -1,4 +1,4 @@
 #main Filegen
 module Filegen
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

data/spec/data_sources/environment_spec.rb

@@ -3,13 +3,20 @@ require 'spec_helper'
 
 describe DataSources::Environment do
   context '#fetch' do
-    it 'retrieves environment variables' do
+    it 'retrieves environment variables as string' do
       in_environment 'MY_NAME' => 'Karl' do
         source = DataSources::Environment.new
         expect(source.fetch('MY_NAME')).to eq('Karl')
       end
     end
 
+    it 'retrieves environment variables as symbol' do
+      in_environment 'MY_NAME' => 'Karl' do
+        source = DataSources::Environment.new
+        expect(source.fetch(:MY_NAME)).to eq('Karl')
+      end
+    end
+
     it 'returns nil if variable cannot be found' do
       in_environment 'MY_NAME' => 'Karl' do
         source = DataSources::Environment.new

data/spec/data_sources/yaml_spec.rb

@@ -13,6 +13,16 @@ describe DataSources::Yaml do
       expect(source.fetch('MY_NAME')).to eq('Karl')
     end
 
+    it 'retrieves symbol variables from yaml file' do
+      file = create_file('blub.yaml', <<-EOF.strip_heredoc
+                         ---
+                         :MY_NAME: Karl
+                         EOF
+                        )
+      source = DataSources::Yaml.new(file)
+      expect(source.fetch('MY_NAME')).to eq('Karl')
+    end
+
     it 'returns nil if variable cannot be found' do
       file = create_file('blub.yaml', <<-EOF.strip_heredoc
                          ---

data/spec/ruby_gen_spec.rb

@@ -0,0 +1,36 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Rubygen do
+  context '#execute' do
+    it 'generates output based on hash with symbol keys' do
+      template = <<-EOS.strip_heredoc
+      <%= lookup('name') %>
+      EOS
+
+      data = {
+        name: 'karl'
+      }
+
+      generator = Rubygen.new
+      result = generator.run(template, data)
+
+      expect(result).to include('karl')
+    end
+
+    it 'generates output based on hash with string keys' do
+      template = <<-EOS.strip_heredoc
+      <%= lookup('name') %>
+      EOS
+
+      data = {
+        'name' => 'karl'
+      }
+
+      generator = Rubygen.new
+      result = generator.run(template, data)
+
+      expect(result).to include('karl')
+    end
+  end
+end

data/spec/rubygen_spec.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Rubygen do
+  context '#execute' do
+    it 'generates output' do
+      template = <<-EOS.strip_heredoc
+      <%= lookup('name') %>
+      EOS
+
+      data = {
+        name: 'karl'
+      }
+
+      generator = Rubygen.new
+      result = generator.run(template, data)
+
+      expect(result).to include('karl')
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,6 +3,11 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 require 'simplecov'
 SimpleCov.command_name 'rspec'
+SimpleCov.start
+
+# Pull in all of the gems including those in the `test` group
+require 'bundler'
+Bundler.require :default, :test, :development
 
 require 'filegen'
 include Filegen

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filegen
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: moneta
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2014-03-26 00:00:00.000000000 Z
+dependencies: []
 description: Evaluate erb templates
 email:
 - dg1@vrnetze.de
@@ -67,6 +51,7 @@ files:
 - lib/filegen/erb_generator.rb
 - lib/filegen/exceptions.rb
 - lib/filegen/options.rb
+- lib/filegen/rubygen.rb
 - lib/filegen/runner.rb
 - lib/filegen/ui.rb
 - lib/filegen/version.rb
@@ -78,6 +63,8 @@ files:
 - spec/data_spec.rb
 - spec/erb_generator_spec.rb
 - spec/options_spec.rb
+- spec/ruby_gen_spec.rb
+- spec/rubygen_spec.rb
 - spec/spec_helper.rb
 - spec/support/config.rb
 - spec/support/debugging.rb
@@ -97,12 +84,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1267357899602957187
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1267357899602957187
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -122,6 +115,8 @@ test_files:
 - spec/data_spec.rb
 - spec/erb_generator_spec.rb
 - spec/options_spec.rb
+- spec/ruby_gen_spec.rb
+- spec/rubygen_spec.rb
 - spec/spec_helper.rb
 - spec/support/config.rb
 - spec/support/debugging.rb