Upgrading trollop to optimist to remove deprecation warnings

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('optimist')
  gem.add_dependency('highline', '~> 1.6.19')
 end

lib/hiera/backend/eyaml/CLI.rb

@@ -1,4 +1,4 @@
-require 'trollop'
+require 'optimist'
 require 'hiera/backend/eyaml'
 require 'hiera/backend/eyaml/logginghelper'
 require 'hiera/backend/eyaml/utils'

lib/hiera/backend/eyaml/subcommand.rb

@@ -86,7 +86,7 @@ def self.parse
  me = self
  all = self.all_options
 
- options = Trollop::options do
+ options = Optimist::options do
 
  version "Hiera-eyaml version " + Hiera::Backend::Eyaml::VERSION.to_s
  banner ["eyaml #{me.prettyname}: #{me.description}", me.helptext, "Options:"].compact.join("\n\n")

lib/hiera/backend/eyaml/subcommands/decrypt.rb

@@ -36,8 +36,8 @@ def self.description
 
  def self.validate options
  sources = [:eyaml, :password, :string, :file, :stdin].collect {|x| x if options[x]}.compact
- Trollop::die "You must specify a source" if sources.count.zero?
- Trollop::die "You can only specify one of (#{sources.join(', ')})" if sources.count > 1
+ Optimist::die "You must specify a source" if sources.count.zero?
+ Optimist::die "You can only specify one of (#{sources.join(', ')})" if sources.count > 1
  options[:source] = sources.first
 
  options[:input_data] = case options[:source]

lib/hiera/backend/eyaml/subcommands/edit.rb

@@ -56,7 +56,7 @@ def self.preamble
  end
 
  def self.validate options
- Trollop::die "You must specify an eyaml file" if ARGV.empty?
+ Optimist::die "You must specify an eyaml file" if ARGV.empty?
  options[:source] = :eyaml
  options[:eyaml] = ARGV.shift
  if File.exists? options[:eyaml]

lib/hiera/backend/eyaml/subcommands/encrypt.rb

@@ -47,8 +47,8 @@ def self.description
 
  def self.validate options
  sources = [:password, :string, :file, :stdin, :eyaml].collect {|x| x if options[x]}.compact
- Trollop::die "You must specify a source" if sources.count.zero?
- Trollop::die "You can only specify one of (#{sources.join(', ')})" if sources.count > 1
+ Optimist::die "You must specify a source" if sources.count.zero?
+ Optimist::die "You can only specify one of (#{sources.join(', ')})" if sources.count > 1
  options[:source] = sources.first
 
  options[:input_data] = case options[:source]

lib/hiera/backend/eyaml/subcommands/recrypt.rb

@@ -27,7 +27,7 @@ def self.helptext
  end
 
  def self.validate options
- Trollop::die "You must specify an eyaml file" if ARGV.empty?
+ Optimist::die "You must specify an eyaml file" if ARGV.empty?
  options[:source] = :eyaml
  options[:eyaml] = ARGV.shift
  options[:input_data] = File.read options[:eyaml]