hiera-eyaml 2.0.6 → 2.0.7

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA1: 
+  metadata.gz: 91148de066d290b4cdd6341ca54a3e20f7ae62fc
+  data.tar.gz: 349951ef92e5d63dbd56cd769e32cf9fc16eb7ec
+SHA512: 
+  metadata.gz: 633324c4a0bb00849b924fb667975650b88256e0941b4ff123499d64d6d11f14f8f47769f9c301423a44d9bd9c9a7257de9eeaa0673290473c1332420882e07f
+  data.tar.gz: 22a2eae199bae8f23f96bfe68634a440eb2dc1db512463b2c54f711085d09e318cd1f2a111232b068f8ec59967c7c8eed7f98a1c67daf638896e2e9ecb004f19

data/.gitignore

@@ -8,3 +8,4 @@ tmp/
 .rvmrc
 .ruby-version
 .ruby-gemset
+Gemfile.lock

data/CHANGES.md

@@ -1,26 +1,33 @@
 Change log for hiera-eyaml
 ==========================
 
-2.06
-----
+2.0.7
+-----
 
- - #131 - Fix another EDITOR bug (#130) that could erase command line flags to the specified editor (@elyscape)
+ - (#142) - Fixed highline dependency to exclude newer versions that are not compatible with ruby 1.8.7 (@elyscape)
+ - (#136) - \t and \r characters are now supported in encrypted blocks (@elyscape)
+ - (#138) - Added missing tags and new tagging tool (@elyscape)
 
-2.05
-----
+2.0.6
+-----
 
- - #128 - Fix a bug (#127) that caused `eyaml edit` to break when `$EDITOR` was a command on PATH rather than a path to a command (@elyscape)
+ - (#131) - Fix another EDITOR bug (#130) that could erase command line flags to the specified editor (@elyscape)
 
-2.04
-----
+2.0.5
+-----
+
+ - (#128) - Fix a bug (#127) that caused `eyaml edit` to break when `$EDITOR` was a command on PATH rather than a path to a command (@elyscape)
+
+2.0.4
+-----
 
  - Add change log
- - #118 - Some initial support for spaces in filenames (primarily targeted at windows platforms) (@elyscape)
- - #114 - Add new config file resolution so that a system wide /etc/eyaml/config.yaml is processed first (@gtmtech)
- - #112 - Improve debugging options and colorise output (@gtmtech)
- - #102 - Extension of temp files should be yaml to help editors provide syntax highlighting (@ColinHebert)
- - #90, #121, #122 - Add preamble in edit mode to make it easier to remember how to edit (@sihil)
- - #96, #111, #116 - Various updates to docs
-
-2.03
-----
+ - (#118) - Some initial support for spaces in filenames (primarily targeted at windows platforms) (@elyscape)
+ - (#114) - Add new config file resolution so that a system wide /etc/eyaml/config.yaml is processed first (@gtmtech)
+ - (#112) - Improve debugging options and colorise output (@gtmtech)
+ - (#102) - Extension of temp files should be yaml to help editors provide syntax highlighting (@ColinHebert)
+ - (#90), #121, #122 - Add preamble in edit mode to make it easier to remember how to edit (@sihil)
+ - (#96), #111, #116 - Various updates to docs
+
+2.0.3
+-----

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org/'
 
-gem 'highline'
-gem 'trollop'
+gem 'highline', '~> 1.6.19'
+gem 'trollop', '~> 2.0'
 
 group :development do
   gem "aruba"

data/hiera-eyaml.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency('trollop', '>= 2.0')
-  gem.add_dependency('highline', '>= 1.6.19')
+  gem.add_dependency('trollop', '~> 2.0')
+  gem.add_dependency('highline', '~> 1.6.19')
 end

data/lib/hiera/backend/eyaml.rb

@@ -2,7 +2,7 @@ class Hiera
   module Backend
     module Eyaml
 
-      VERSION = "2.0.6"
+      VERSION = "2.0.7"
       DESCRIPTION = "Hiera-eyaml is a backend for Hiera which provides OpenSSL encryption/decryption for Hiera properties"
 
       class RecoverableError < StandardError

data/lib/hiera/backend/eyaml/parser/encrypted_tokens.rb

@@ -39,13 +39,13 @@ class Hiera
             case format
               when :block
                 # strip any white space
-                @cipher = @cipher.gsub(/ /m, "")
+                @cipher = @cipher.gsub(/[ \t]/, "")
                 # normalize indentation
-                ciphertext = @cipher.gsub(/\n/, "\n" + @indentation)
+                ciphertext = @cipher.gsub(/[\n\r]/, "\n" + @indentation)
                 chevron = (args[:use_chevron].nil? || args[:use_chevron]) ? ">\n" : ''
                 "#{label_string}#{chevron}" + @indentation + "ENC[#{@encryptor.tag},#{ciphertext}]"
               when :string
-                ciphertext = @cipher.gsub(/\n/, "")
+                ciphertext = @cipher.gsub(/[\n\r]/, "")
                 "#{label_string}ENC[#{@encryptor.tag},#{ciphertext}]"
               else
                 raise "#{@format} is not a valid format"
@@ -87,7 +87,7 @@ class Hiera
             @string_token_type = EncStringTokenType.new()
           end
           def create_token(string)
-            @string_token_type.create_token(string.gsub(/[ \n]/, ''))
+            @string_token_type.create_token(string.gsub(/\s/, ''))
           end
         end
 
@@ -103,7 +103,7 @@ class Hiera
 
         class EncBlockTokenType < EncTokenType
           def initialize
-            @regex = />\n(\s*)ENC\[(\w+,)?([a-zA-Z0-9\+\/ =\n]+?)\]/
+            @regex = />\n(\s*)ENC\[(\w+,)?([a-zA-Z0-9\+\/=\s]+?)\]/
           end
           def create_token(string)
             md = @regex.match(string)

data/tools/git_tag_release.rb

@@ -0,0 +1,98 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('1.9')
+  $stderr.puts "This script requires Ruby >= 1.9"
+  exit 1
+end
+
+require 'open3'
+result = Open3.capture3('git rev-parse --show-toplevel')
+unless result[2].exitstatus == 0
+  $stderr.puts "You do not appear to be in a git repository. This script must be run from inside a git repository."
+  exit 2
+end
+filename = result[0].lines.first.chomp + '/CHANGES.md'
+unless File.exist?(filename)
+  $stderr.puts "CHANGES.md not found. Please ensure that CHANGES.md exists."
+  exit 3
+end
+contents = IO.read(filename)
+
+lines = contents.lines.drop(3).map(&:chomp).reject(&:empty?)
+versions = Hash.new
+currentversion = nil
+versions[nil] = []
+lines.each_with_index do |line, index|
+  if line =~ /\A-+\z/
+    versions[currentversion].pop
+    currentversion = lines[index-1]
+    versions[currentversion] = []
+  else
+    versions[currentversion] << line
+  end
+end
+versions.delete(nil)
+
+def prompt(*args)
+  print(*args)
+  gets.chomp
+end
+
+newest = versions.first[0]
+version = prompt "Version [#{newest}]: "
+version = newest if version.empty?
+
+unless versions[version]
+  $stderr.puts "Version #{version} is invalid. Valid versions are: #{versions.keys.join(', ')}"
+  exit 4
+end
+
+tagname = "v#{version}"
+
+
+
+result = Open3.capture3("git rev-parse #{tagname}")
+if result[2].exitstatus == 0
+  $stderr.puts "Tag #{tagname} already exists."
+  exit 5
+end
+
+commit = prompt "Commit: "
+
+result = Open3.capture3("git --no-pager log -1 #{commit} --format='%ci'")
+unless result[2].exitstatus == 0
+  $stderr.puts "Commit '#{commit}' is not valid."
+  exit result[2].exitstatus
+end
+commitdate = result[0].lines.first.chomp
+
+def word_wrap(line, width)
+  first_prefix = line.match(/([ -]*)/)[1]
+  prefix = ' ' * first_prefix.size
+  real_width = width - (prefix.size * 2)
+  line[prefix.size..-1].gsub(/(^)?(.{1,#{real_width}})(?: +|$)/) { |s| $1 ? "#{first_prefix}#{s}\n" : "#{prefix}#{s}\n" }
+end
+
+require 'tempfile'
+begin
+  tf = Tempfile.new('tag-message')
+  tf.puts "Version #{version} release"
+  tf.puts ""
+  tf.puts "Changes:"
+  versions[version].each do |line|
+    tf.puts word_wrap(line, 80)
+  end
+  tf.flush
+
+  result = Open3.capture3({'GIT_COMMITTER_DATE' => commitdate}, "git tag -a #{tagname} #{commit} -F #{tf.path}")
+  $stderr.puts result[1]
+  if result[2].exitstatus == 0
+    system "git --no-pager show #{tagname} --no-patch"
+    puts ""
+    puts "Tag created. Please push to GitHub with `git push origin #{tagname}`."
+  end
+  exit result[2].exitstatus
+ensure
+  tf.close!
+end

metadata

@@ -1,60 +1,49 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: hiera-eyaml
-version: !ruby/object:Gem::Version
-  version: 2.0.6
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  version: 2.0.7
 platform: ruby
-authors:
+authors: 
 - Tom Poulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: trollop
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
+
+date: 2015-03-04 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "2.0"
+  version_requirements: *id001
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.6.19
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  name: trollop
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
         version: 1.6.19
+  version_requirements: *id002
+  prerelease: false
+  type: :runtime
+  name: highline
 description: Hiera backend for decrypting encrypted yaml properties
 email: 
-executables:
+executables: 
 - eyaml
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - CHANGES.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - PLUGINS.md
 - README.md
@@ -85,30 +74,33 @@ files:
 - sublime_text/README.md
 - sublime_text/eyaml.sublime-package
 - sublime_text/eyaml.syntax_definition.json
+- tools/git_tag_release.rb
 - tools/regem.sh
 homepage: http://github.com/TomPoulton/hiera-eyaml
-licenses:
+licenses: 
 - MIT
+metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - &id003 
+    - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id003
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: OpenSSL Encryption backend for Hiera
 test_files: []
+

data/Gemfile.lock

@@ -1,48 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    aruba (0.5.3)
-      childprocess (>= 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
-    builder (3.2.2)
-    childprocess (0.3.9)
-      ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.3.10)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.0.2)
-    diff-lcs (1.2.5)
-    facter (1.7.3)
-    ffi (1.9.3)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    hiera (1.2.1)
-      json_pure
-    hiera-eyaml-plaintext (0.5)
-    highline (1.6.20)
-    json_pure (1.8.1)
-    multi_json (1.8.2)
-    multi_test (0.0.2)
-    puppet (3.3.2)
-      facter (~> 1.6)
-      hiera (~> 1.0)
-      rgen (~> 0.6.5)
-    rake (10.1.0)
-    rgen (0.6.6)
-    rspec-expectations (2.14.4)
-      diff-lcs (>= 1.1.3, < 2.0)
-    trollop (2.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aruba
-  hiera-eyaml-plaintext
-  highline
-  puppet
-  rake
-  trollop