filegen 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d9f441a26f9e6601791aa1fe6e83301c46dbac9
-  data.tar.gz: cfe9f0bd4544e817dc3c3ca003b2f01a6a161d71
+  metadata.gz: e274f34d1c3bdb315d61f8a64256f639189a7013
+  data.tar.gz: b8933b8b512918fe7c0e7491ad0fa0c25e7770b9
 SHA512:
-  metadata.gz: 01c3b27f2ab41b16f2bb5bec395e8f2515eadb0bdb1f1f9be3941e86b528cf839e885ca43449903877d95f27cc1da35f5ef7a1d4244d7e2e1164ee70f963a763
-  data.tar.gz: 6040a9e540c5a6bb6468f16b84cd456364edfeeea6453d7e8cc76511541ae4e697e559f7919f1f505cda36579b5e8dfcda7cfcd7d6846a7bec3f492abdfb936f
+  metadata.gz: 0de6d52b07d2cc21a39c4af931553fda06c69614921bdecff0da36a4bd69d2ba954919cea05bfdcd572768a918454f4baaf6b75ca17edf8fc66e3eea661dba09
+  data.tar.gz: e79a8ebd0721599d9806b0bda60bc7e22278f0907bd3a773d8c6cb4939f33420452b36018c31373b9e41a5e1ba206e1174f1fb902c64c1848601e94f650f2388

data/.gitignore

@@ -1,3 +1,5 @@
+*.xz
+*.gz
 *.gem
 *.rbc
 .bundle

data/.rspec

@@ -1,3 +1,4 @@
+--require rspec/legacy_formatters
 --format Fuubar
 --order rand
 --color

data/Gemfile

@@ -1,34 +1,37 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in filegen.gemspec
+# use gem spec 
 gemspec
 
-group :test do
-  gem 'aruba'
-  gem 'cucumber'
-  gem 'fuubar'
-  gem 'rspec'
-  gem 'simplecov'
-  gem 'rubocop'
-  gem 'coveralls'
-end
+group :development, :test do
+  if RUBY_VERSION < '2.0.0'
+    gem 'pry-debugger', require: false
+    gem 'debugger'
+    gem 'debugger-completion', require: false
+  else
+    gem 'pry-byebug', require: false
+    gem 'byebug'
+  end
 
-group :development do
-  gem 'debugger'
-  gem 'awesome_print'
-  gem 'debugger-completion'
-  gem 'pry'
-  gem 'pry-debugger'
-  gem 'pry-doc'
-  gem 'tmrb'
-  gem 'yard'
+  gem 'activesupport', require: false
+  gem 'aruba', require: false
+  gem 'awesome_print', require: 'ap'
+  gem 'bundler', '~> 1.3', require: false
+  gem 'coveralls', require: false
+  gem 'cucumber', require: false
+  gem 'erubis'
+  gem 'fedux_org-stdlib', require: false
+  gem 'fuubar'
   gem 'github-markup'
+  gem 'pry', require: false
+  gem 'pry-doc', require: false
+  gem 'rake', require: false
   gem 'redcarpet'
+  gem 'rspec', require: false
+  gem 'rspec-legacy_formatters', require: false
+  gem 'rubocop', require: false
+  gem 'simplecov'
+  gem 'tmrb', require: false
+  gem 'versionomy'
+  gem 'yard', require: false
 end
-
-gem 'rake', group: [:development, :test]
-gem 'fedux_org-stdlib', group: [:development, :test]
-gem 'bundler', '~> 1.3', group: [:development, :test]
-gem 'erubis', group: [:development, :test]
-gem 'versionomy', group: [:development, :test]
-gem 'activesupport', group: [:development, :test]

data/README.md

@@ -208,4 +208,4 @@ chmod +x <wrapper>
 
 ## Contributing
 
-Please have a look at the {file:README.DEVELOPER.md developer readme}
+Please have a look at the {file:CONTRIBUTING.md contribution guide}

data/Rakefile

@@ -1,5 +1,7 @@
 #!/usr/bin/env rake
 
+$LOAD_PATH << File.expand_path('../lib', __FILE__)
+
 #require 'bundler'
 #Bundler.require :default, :test, :development
 

data/features/error_handling.feature

@@ -26,3 +26,14 @@ Feature: Error handling
     File "template1.abc" is not a valid erb template: file ending erb
     """
 
+    @wip
+  Scenario: Non existing YAML-file
+    Given a file named "template.erb" with:
+    """
+    Hello <%= lookup('name') %>!
+    """
+    When I run `filegen -y input.yaml template.erb`
+    Then the stderr should contain:
+    """
+    Yaml-file "input.yaml" not found
+    """

data/features/support/env.rb

@@ -2,7 +2,12 @@
 $LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
 
 unless ENV['CI'] == 'true'
-  require 'debugger'
+  if RUBY_VERSION < '2.0.0'
+    require 'debugger'
+  else
+    require 'byebug'
+  end
+
   require 'pry'
 end
 

data/lib/filegen.rb

@@ -6,6 +6,8 @@ require 'ostruct'
 require 'logger'
 require 'active_support/hash_with_indifferent_access'
 require 'stringio'
+require 'json'
+require 'psych'
 
 require 'filegen/version'
 require 'filegen/ui'

data/lib/filegen/data_sources/yaml.rb

@@ -13,8 +13,8 @@ module Filegen
       # Create data source
       def initialize(file)
         @source = HashWithIndifferentAccess.new(Psych.load_file(file))
-      rescue
-        @source = HashWithIndifferentAccess.new
+      rescue Errno::ENOENT
+        raise Exceptions::YamlFileNotFound, JSON.dump(file: file)
       end
 
       def fetch(key, default_value = nil)

data/lib/filegen/exceptions.rb

@@ -16,5 +16,8 @@ module Filegen
 
     # raised if a given erb template has syntax errors in it
     class ErbTemplateHasSyntaxErrors < Exception; end
+
+    # raised if yaml file cannot be found
+    class YamlFileNotFound < Exception; end
   end
 end

data/lib/filegen/runner.rb

@@ -32,15 +32,18 @@ module Filegen
         generator.compile(options.source, options.destination)
 
         exitstatus = 0
-      rescue RuntimeError => e
-        Filegen::Ui.error e.message
-        exitstatus = 1
       rescue Interrupt
         Filegen::Ui.warning 'You told me to stop command execution.'
         exitstatus = 2
       rescue Exceptions::ErbTemplateHasSyntaxErrors => e
         Filegen::Ui.error "Syntax error in ERB-Template: \n" + e.message
         exitstatus = 3
+      rescue Exceptions::YamlFileNotFound => e
+        Filegen::Ui.error "Yaml-file \"#{JSON.parse(e.message)['file']}\" not found."
+        exitstatus = 4
+      rescue StandardError => e
+        Filegen::Ui.error "#{e.class} - #{e.message}"
+        exitstatus = 99
       end
 
       @kernel.exit(exitstatus)

data/lib/filegen/version.rb

@@ -1,4 +1,4 @@
 #main Filegen
 module Filegen
-  VERSION = '0.4.1'
+  VERSION = '0.4.3'
 end

data/share/archlinux/PKGBUILD

@@ -0,0 +1,38 @@
+# Maintainer: Max Meyer <dev@fedux.org>
+pkgname=filegen
+pkgver=0.4.1
+pkgrel=1
+pkgdesc="generating files made easy"
+arch=(i686 x86_64)
+url="https://github.com/dg-vrnetze/${pkgname}"
+license=('MIT')
+depends=(ruby)
+makedepends=(rubygems)
+source=(http://gems.rubyforge.org/gems/$pkgname-$pkgver.gem)
+noextract=($pkgname-$pkgver.gem)
+sha256sums=('34b0c3082b41bf44c0d2b4f906871c135e651a84de9d3be124d2f45ff4b79881')
+
+package() {
+  cd "$srcdir"
+
+  _library_dir=/usr/lib/${pkgname}
+  _share_dir="${_library_dir}/gems/${pkgname}-${pkgver}/share"
+  _systemd_dir=/usr/lib/systemd/system
+  _bin_dir=/usr/bin
+
+  install -d ${pkgdir}${_library_dir}
+  install -d ${pkgdir}${_bin_dir}
+
+  gem install --env-shebang --wrappers --no-ri --no-rdoc --install-dir ${pkgdir}/${_library_dir} $pkgname 
+
+  echo '#!/usr/bin/env bash'                                               >> ${pkgdir}${_bin_dir}/${pkgname}
+  echo "export GEM_HOME='${_library_dir}'"                                 >> ${pkgdir}${_bin_dir}/${pkgname}
+  echo "export GEM_PATH='${_library_dir}'"                                 >> ${pkgdir}${_bin_dir}/${pkgname}
+  echo "export GEM_ROOT='${_library_dir}'"                                 >> ${pkgdir}${_bin_dir}/${pkgname}
+  echo "exec ${_library_dir}/gems/${pkgname}-${pkgver}/bin/${pkgname} \$*" >> ${pkgdir}${_bin_dir}/${pkgname}
+
+  chmod a+x ${pkgdir}${_bin_dir}/${pkgname}
+  rm -r ${pkgdir}${_library_dir}/cache
+}
+
+# vim:set ts=2 sw=2 et:

data/spec/data_sources/yaml_spec.rb

@@ -2,6 +2,12 @@
 require 'spec_helper'
 
 describe DataSources::Yaml do
+  context '#initialize' do
+    it 'raises an exception if the yaml file cannot be found' do
+      expect { DataSources::Yaml.new('not valid file') }.to raise_error Exceptions::YamlFileNotFound
+    end
+  end
+
   context '#fetch' do
     it 'retrieves variables from yaml file' do
       file = create_file('blub.yaml', <<-EOF.strip_heredoc
@@ -32,10 +38,5 @@ describe DataSources::Yaml do
       source = DataSources::Yaml.new(file)
       expect(source.fetch('NOT_MY_NAME')).to be_nil
     end
-
-    it 'returns nil if file cannot be found' do
-      source = DataSources::Yaml.new('not valid file')
-      expect(source.fetch('NOT_MY_NAME')).to be_nil
-    end
   end
 end

data/spec/support/debugging.rb

@@ -1,5 +1,10 @@
 # encoding: utf-8
 unless ENV['CI'] == 'true'
-  require 'debugger'
+  if RUBY_VERSION < '2.0.0'
+    require 'debugger'
+  else
+    require 'byebug'
+  end
+
   require 'pry'
 end

data/spec/support/{config.rb → rspec.rb}

@@ -1,6 +1,5 @@
 # encoding: utf-8
 RSpec.configure do |c|
-  c.treat_symbols_as_metadata_keys_with_true_values = true
   c.filter_run focus: true
   c.run_all_when_everything_filtered = true
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filegen
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Dennis Günnewig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -40,9 +40,9 @@ files:
 - ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.md
-- README.DEVELOPER.md
 - README.md
 - Rakefile
 - bin/filegen
@@ -70,6 +70,7 @@ files:
 - lib/filegen/version.rb
 - rubocop-todo.yml
 - scripts/terminal
+- share/archlinux/PKGBUILD
 - spec/data_source_builder_spec.rb
 - spec/data_sources/environment_spec.rb
 - spec/data_sources/yaml_spec.rb
@@ -79,11 +80,11 @@ files:
 - spec/ruby_gen_spec.rb
 - spec/rubygen_spec.rb
 - spec/spec_helper.rb
-- spec/support/config.rb
 - spec/support/debugging.rb
 - spec/support/environment.rb
 - spec/support/filesystem.rb
 - spec/support/here_doc.rb
+- spec/support/rspec.rb
 homepage: https://github.com/dg-vrnetze/filegen
 licenses:
 - MIT
@@ -124,9 +125,9 @@ test_files:
 - spec/ruby_gen_spec.rb
 - spec/rubygen_spec.rb
 - spec/spec_helper.rb
-- spec/support/config.rb
 - spec/support/debugging.rb
 - spec/support/environment.rb
 - spec/support/filesystem.rb
 - spec/support/here_doc.rb
+- spec/support/rspec.rb
 has_rdoc: