Merge branch 'releases/0.15.0'

.rubocop.yml

@@ -1,6 +1,11 @@
+require: rubocop-rspec
+
 AllCops:
+AllCops:
+  TargetRubyVersion: 2.2
   Exclude:
     - tmp/**/*
+    - vendor/**/*
 Metrics/LineLength:
   Max: 240
 Style/MethodDefParentheses:

.travis.yml

@@ -1,15 +1,15 @@
-sudo: true
+sudo: false
 language: ruby
 rvm:
-  - '2.3'
-  - '2.2'
-  - '2.1'
-cache:
-  - bundler
-  - apt
+  - '2.4.1'
+  - '2.3.4'
+  - '2.2.7'
+cache: bundler
+
 before_install:
-  - sudo apt-get update && sudo wget https://github.com/scottkosty/install-tl-ubuntu/raw/master/install-tl-ubuntu && sudo chmod +x ./install-tl-ubuntu && sudo ./install-tl-ubuntu
-  - gem install bundler -v 1.10.6
+  - gem install bundler --no-document
+
 script:
-  - bundle exec indoctrinatr demo
-  - bundle exec rake test_with_coveralls
+  - bundle exec rubocop --version
+  - bundle exec rubocop --display-cop-names --extra-details 
+  - bundle exec indoctrinatr new demo

CHANGELOG.md

@@ -1,5 +1,12 @@
 # indoctrinatr-tools
 
+## v0.15.0 (2017-04-16)
+
+### changes
+
+* updated dependencies
+* removed support for Ruby v2.1
+
 ## v0.14.0 (2016-09-14)
 
 ### changes

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Indoctrinatr Development Team
+Copyright (c) 2014-2017 Indoctrinatr Development Team, dkd Internet Service GmbH, Frankfurt am Main
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

features/version.feature

@@ -2,4 +2,4 @@ Feature: Running the "version" command
 
   Scenario:
     When I successfully run `indoctrinatr version`
-    Then the output should contain "0.13.0"
+    Then the output should contain "0.15.0"

indoctrinatr-tools.gemspec

@@ -1,9 +1,10 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'indoctrinatr/tools/version'
 
-Gem::Specification.new do |spec|
+Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.name          = 'indoctrinatr-tools'
   spec.version       = Indoctrinatr::Tools::VERSION
   spec.authors       = ['Nicolai Reuschling', 'Luka Lüdicke']
@@ -13,24 +14,25 @@ Gem::Specification.new do |spec|
   spec.homepage      = ''
   spec.license       = 'MIT'
 
-  spec.required_ruby_version = '~> 2.0'
+  spec.required_ruby_version = '~> 2.2'
 
   spec.files         = `git ls-files -z`.split("\x0")
   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_development_dependency 'bundler',   '~> 1.13'
-  spec.add_development_dependency 'rake',      '~> 11.2'
+  spec.add_development_dependency 'bundler',   '~> 1.14'
+  spec.add_development_dependency 'rake',      '~> 12.0'
   spec.add_development_dependency 'rspec',     '~> 3.5'
   spec.add_development_dependency 'cucumber',  '~> 2.4'
   spec.add_development_dependency 'aruba',     '~> 0.14'
-  spec.add_development_dependency 'rubocop',   '~> 0.42'
+  spec.add_development_dependency 'rubocop',   '~> 0.48'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.15'
   spec.add_development_dependency 'pry',       '~> 0.10'
   spec.add_development_dependency 'coveralls', '~> 0.8'
 
-  spec.add_dependency 'gli',      '~> 2.12'
-  spec.add_dependency 'rubyzip',  '~> 1.1'
+  spec.add_dependency 'gli',      '~> 2.16'
+  spec.add_dependency 'rubyzip',  '~> 1.2'
   spec.add_dependency 'erubis',   '~> 2.7'
   spec.add_dependency 'to_latex', '~> 0.5'
   spec.add_dependency 'RedCloth', '~> 4.3'

lib/indoctrinatr/tools/content_for_tex_files.rb

@@ -19,7 +19,7 @@ def retrieve_binding
       end
 
       def customized_output_file_name
-        @_customized_output_file_name ||= eval('"' + @_output_file_name + '"') # rubocop:disable Lint/Eval
+        @_customized_output_file_name ||= eval('"' + @_output_file_name + '"') # rubocop:disable Security/Eval
       end
 
       def template_asset_path

lib/indoctrinatr/tools/directory_helpers.rb

@@ -9,7 +9,7 @@ def print_dirtree_style directory = '.'
         end
       end
 
-      def list_files_of_type directory = '.', types = %w(erb rb yaml sty tex) # default file types for template docs
+      def list_files_of_type directory = '.', types = %w[erb rb yaml sty tex] # default file types for template docs
         # found and modified from http://stackoverflow.com/a/3504307/1796645
         Dir.glob("#{directory}/**/*.{#{types.join(',')}}") # recursively list files of type in types array
       end

lib/indoctrinatr/tools/field_name_values.rb

@@ -5,7 +5,7 @@ module Tools
     # This class defines the content for a document that has the field names as content.
     class FieldNameValues < ContentForTexFiles
       # TODO: extensive list of possibilities
-      PICTURE_FILE_ENDINGS = %w(.png .jpeg .jpg .bmp .gif .pdf).freeze
+      PICTURE_FILE_ENDINGS = %w[.png .jpeg .jpg .bmp .gif .pdf].freeze
       def _field_names_as_values # rubocop:disable Metrics/AbcSize
         @_configuration.attributes_as_hashes_in_array.each do |attribute_hash|
           # Usage of \textless to avoid issues with the < > characters.

lib/indoctrinatr/tools/template_pack_error_checker.rb

@@ -7,8 +7,8 @@ class TemplatePackErrorChecker
 
       # class wide constants
       # needs to match indoctrinatr's TemplateField model
-      VALID_PRESENTATIONS = %w(text textarea checkbox radiobutton dropdown date range file).freeze
-      REQUIRES_AVAILABLE_OPTIONS = %w(dropdown checkbox radiobutton).freeze
+      VALID_PRESENTATIONS = %w[text textarea checkbox radiobutton dropdown date range file].freeze
+      REQUIRES_AVAILABLE_OPTIONS = %w[dropdown checkbox radiobutton].freeze
 
       attr_accessor :template_pack_name, :config_file
       def initialize template_pack_name

lib/indoctrinatr/tools/template_pack_helpers.rb

@@ -35,7 +35,7 @@ def pdf_with_default_values_file_path configuration # rubocop:disable Metrics/Ab
         if default_values.customized_output_file_name == default_values.default_file_name
           Pathname.new(Dir.pwd).join pack_documentation_examples_dir_path + default_values.customized_output_file_name
         else
-          Pathname.new(Dir.pwd).join pack_documentation_examples_dir_path + eval('"' + default_values.output_file_name + '"') # rubocop:disable Lint/Eval
+          Pathname.new(Dir.pwd).join pack_documentation_examples_dir_path + eval('"' + default_values.output_file_name + '"') # rubocop:disable Security/Eval
           # usage of eval to execute the interpolation of a custom filename string with interpolation - e.g. a filename with the current date
         end
       end

lib/indoctrinatr/tools/version.rb

@@ -1,5 +1,5 @@
 module Indoctrinatr
   module Tools
-    VERSION = '0.14.0'.freeze
+    VERSION = '0.15.0'.freeze
   end
 end

spec/indoctrinatr/templates/configuration_file_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 require 'pathname'
 
-describe 'configuration.yaml' do
-  it 'should exist' do
+context 'configuration.yaml' do
+  it 'exists' do
     configuration_file = Pathname.new(__FILE__).join '..', '..', '..', '..', 'lib', 'indoctrinatr', 'templates', 'configuration.yaml'
     expect(File.exist?(configuration_file)).to eq true
   end

spec/indoctrinatr/templates/tex_file_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 require 'pathname'
 
-describe 'template.tex.erb' do
-  it 'should exist' do
+context 'template.tex.erb' do
+  it 'exists' do
     template_file = Pathname.new(__FILE__).join '..', '..', '..', '..', 'lib', 'indoctrinatr', 'templates', 'template.tex.erb'
     expect(File.exist?(template_file)).to eq true
   end

spec/indoctrinatr/tools/textile_support_spec.rb

@@ -2,7 +2,7 @@
 require 'indoctrinatr/tools/default_values'
 require 'indoctrinatr/tools/template_pack_configuration'
 
-describe "support for Textile with 'textilize' function" do
+context "support for Textile with 'textilize' function" do
   let(:configuration) do
     c = Indoctrinatr::Tools::TemplatePackConfiguration.new
     c.attributes_as_hashes_in_array = []

spec/indoctrinatr/tools/version_spec.rb

@@ -3,6 +3,6 @@
 
 describe Indoctrinatr::Tools do
   it 'defines a VERSION constant' do
-    expect(Indoctrinatr::Tools::VERSION).to eq '0.13.0'
+    expect(Indoctrinatr::Tools::VERSION).to eq '0.15.0'
   end
 end

spec/redcloth_latex_formatter_patch/patch_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'redcloth_latex_formatter_patch/patch'
 
-describe 'patches for RedCloth::LATEX::Formatter' do
+context 'patches for RedCloth::LATEX::Formatter' do
   it 'tranforms a h1. headline to LaTeX chapter notation' do
     text = 'h1. Headline'
     expect(RedCloth.new(text).to_latex).to eq "\\chapter{Headline}\n\n"
@@ -31,8 +31,4 @@
   it 'transforms -text- to to LaTeX \st{}' do
     expect(RedCloth.new('-no no no-').to_latex).to eq "\\st{no no no}\n\n"
   end
-
-  it 'transforms *text* to to LaTeX \st{}' do
-    expect(RedCloth.new('-no no no-').to_latex).to eq "\\st{no no no}\n\n"
-  end
 end