configliere 0.3.4 → 0.4.4

data/Rakefile

@@ -1,10 +1,20 @@
 require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 require 'rake'
 
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "configliere"
+    gem.homepage = "http://infochimps.com/labs"
+    gem.license = "MIT"
     gem.summary = %Q{Wise, discreet configuration management}
     gem.description = %Q{ You've got a script. It's got some settings. Some settings are for this module, some are for that module. Most of them don't change. Except on your laptop, where the paths are different.  Or when you're in production mode. Or when you're testing from the command line.
 
@@ -12,41 +22,40 @@ begin
 
 Configliere manage settings from many sources: static constants, simple config files, environment variables, commandline options, straight ruby. You don't have to predefine anything, but you can ask configliere to type-convert, require, document or password-obscure any of its fields. Modules can define config settings independently of each other and the main program.
 } #'
-    gem.email = "flip@infochimps.org"
-    gem.homepage = "http://github.com/mrflip/configliere"
-    gem.authors = ["mrflip"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_development_dependency "yard", ">= 0"
-    # gem.add_dependency "highline", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+    gem.email = "coders@infochimps.org"
+    gem.authors = ["infochimps", "mrflip"]
   end
-  Jeweler::GemcutterTasks.new
+  Jeweler::RubygemsDotOrgTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-begin
-  require 'spec/rake/spectask'
-  Spec::Rake::SpecTask.new(:spec) do |spec|
-    spec.libs << 'lib' << 'spec'
-    spec.spec_files = FileList['spec/**/*_spec.rb']
-  end
 
-  Spec::Rake::SpecTask.new(:rcov) do |spec|
-    spec.libs << 'lib' << 'spec'
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
+
+begin
+  #
+  # if rcov shits the bed with ruby 1.9, see
+  #   https://github.com/relevance/rcov/issues/31
+  #
+  RSpec::Core::RakeTask.new(:rcov) do |spec|
     spec.pattern = 'spec/**/*_spec.rb'
     spec.rcov = true
+    spec.rcov_opts = %w[ --exclude .rvm --no-comments --text-summary]
   end
-  task :spec => :check_dependencies
 rescue LoadError
-  task :spec do
-    abort "Spec is not available. In order to run spec, you must: sudo gem install spec"
+  task :rspec do
+    abort "Rspec is not available. In order to run spec, you must: sudo gem install rspec"
   end
 end
 
 begin
-  require 'reek/adapters/rake_task'
-  Reek::RakeTask.new do |t|
+  require 'reek/rake/task'
+  Reek::Rake::Task.new do |t|
     t.fail_on_error = true
     t.verbose = false
     t.source_files = 'lib/**/*.rb'

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.4.4

data/bin/configliere

@@ -1,85 +1,85 @@
 #!/usr/bin/env ruby
-require 'rubygems' ; $: << File.dirname(__FILE__)+'/../lib'
+$: << File.dirname(__FILE__)+'/../lib'
 require 'configliere'
-require 'configliere/client'
-require 'configliere/client/commands'
-Log = Logger.new(STDERR) unless defined?(Log)
-
-class ConfigliereScript < Configliere::CommandClient
-  def usage
-    %Q{Client for the configliere gem: manipulate configuration and passwords for automated scripts
-
-usage: #{File.basename($0)} command handle [...--option=val...]
-where
-  command:             One of: #{COMMANDS.keys[0..-2].join(', ')} or #{COMMANDS.keys.last}
-  handle:              Name of the configliere group (within the configliere_file) or path to a configliere YAML file.
-
-Configuration taken from #{configliere_file} by default.}
-    end
-
-  def process_options! *args
-    super *args
-    self.command = options[:_rest].shift.to_sym rescue nil
-    self.handle  = options[:_rest].shift.to_sym rescue nil
+
+Settings.use :commands
+
+Settings.description =  %Q{Client for the configliere gem: manipulate configuration and passwords for automated scripts}
+
+Settings.define_command :dump,    :description => "Show the whole contents of the file"
+Settings.define_command :list,    :description => "Show all params in the configliere file."
+Settings.define_command :get,     :description => "show values given as commandline args, eg: #{File.basename($0)} get this that"
+Settings.define_command :set,     :description => "sets values given as commandline args, eg: #{File.basename($0)} set this=1 that=3"
+Settings.define_command :delete,  :description => "sets values given as commandline args, eg: #{File.basename($0)} delete this that"
+Settings.define_command :encrypt, :description => "encrypt the param"
+Settings.define_command :decrypt, :description => "Store the param as decrypted back into the file. Can be undone with 'encrypt'."
+
+Settings.define :from,   :flag => 'f', :type => :filename, :description => "Configliere config file to load"
+Settings.define :into,   :flag => 'i', :type => :filename, :description => "Configliere config file to save into"
+
+Settings.resolve!
+ARGV.replace []
+
+Store = Configliere.new
+Store.read(Settings.from) if Settings.from
+
+#
+# Execute
+#
+
+case Settings.command_name
+when :dump
+  puts Store.to_hash.to_yaml
+
+when :list
+  $stderr.puts "Param names in #{Settings.from}:"
+  Store.each do |attr, val|
+    puts "  #{attr}"
   end
 
+when :get
+  $stderr.puts "Values for #{Settings.rest.join(", ")} from #{Settings.from}"
+  Settings.rest.map(&:to_sym).each do |attr|
+    puts "%-23s\t%s" % ["#{attr}:", Store[attr]]
+  end
+
+when :set
+  $stderr.puts "Setting #{Settings.rest.join(", ")} for #{Settings.from}"
+  Settings.rest.each do |attr_val|
+    attr, val = attr_val.split('=', 2)
+    attr = attr.to_sym
+    if val.nil? then warn "Please specify a value for #{attr}" ; next ; end
+    Store[attr] = val
 
-    # ===========================================================================
-    #
-    # Commands
-    #
-
-    COMMANDS[:fix] = "encrypt the param"
-    def fix
-      Log.info "Fixing stored info for #{handle}"
-      store.fix!(handle, option_or_ask(:key))
-    end
-    COMMANDS[:encrypt] = "synonym for fix. Params are stored encrypted by default"
-    def encrypt() fix end
-
-    COMMANDS[:decrypt] = "Store the param as decrypted back into the file. Can be undone with 'fix'."
-    def decrypt
-      Log.info "Storing info for #{handle} in **DECRYPTED** form."
-      param = get(handle)
-      store.put_decrypted!(handle, param)
-    end
-
-    COMMANDS[:list] = "Show all params in the configliere file."
-    def list
-      puts "List of param names: #{store.handles.inspect}"
-    end
-
-    COMMANDS[:delete] = "Permanently deletes the param"
-    def delete
-      Log.info "Permanently deleting stored info for #{handle}. O, I die, Horatio."
-      store.delete! handle, options[:key]
-    end
-
-    COMMANDS[:set] = "sets values using remaining arguments from the command line. eg #{File.basename($0)} set my_program --username=bob --password=frank"
-    def set
-      param = get(handle)
-      param.merge! external_options
-      store.put handle, param
-      store.save!
-      Log.info "Stored configuration for #{handle}: #{param}"
-    end
-
-    COMMANDS[:change_key] = "set a new key and/or new key options. Specify the old key as usual with --key='...' and the new one with --new_key='...'"
-    def change_key
-      param = get(handle)
-      new_key = option_or_ask(:new_key)
-      new_hsh = param.to_decrypted
-      new_param = Configliere::Param.new(new_key, new_hsh)
-      store.put! handle, new_param
-      Log.info "Changed param key for #{handle}: #{new_param}"
-    end
-
-    COMMANDS[:show] = "print the decrypted information"
-    def show
-      param = get(handle)
-      puts "Stored info for #{handle}:\n  #{param.to_s}"
-    end
+    puts "%-23s\t%s" % ["#{attr}:", val.inspect]
+  end
+
+when :delete
+  $stderr.puts "Deleting #{Settings.rest.join(", ")} from #{Settings.from}. O, I die, Horatio."
+  Settings.rest.map(&:to_sym).each do |attr|
+    Store.delete(attr)
+  end
 
+when :encrypt
+  Store.use :encrypted
+  $stderr.puts "Encrypting #{Settings.rest.join(", ")} from #{Settings.from}. Fnord"
+  Settings.rest.each{|attr| Store.define attr, :encrypted => true }
+  Store.encrypt_pass = Settings.encrypt_pass || Settings[:encrypt_pass]
+  Store.resolve!
+
+when :decrypt
+  Store.use :encrypted
+  $stderr.puts "Decrypting #{Settings.rest.join(", ")} from #{Settings.from}. Fnord"
+  Settings.rest.each{|attr| Store.define attr, :encrypted => true }
+  Store.encrypt_pass = Settings.encrypt_pass || Settings[:encrypt_pass]
+  Store.resolve!
+
+  puts Store.to_hash.to_yaml
+
+else
+  Settings.die "Please use one of the given commands"
 end
 
-ConfigliereScript.new.run
+if Settings.into
+  Store.save!(Settings.into)
+end

data/bin/configliere-decrypt

@@ -0,0 +1,85 @@
+#!/usr/bin/env ruby
+$: << File.dirname(__FILE__)+'/../lib'
+require 'configliere'
+
+Settings.use :commands
+
+Settings.description =  %Q{Client for the configliere gem: manipulate configuration and passwords for automated scripts}
+
+Settings.define_command :dump,    :description => "Show the whole contents of the file"
+Settings.define_command :list,    :description => "Show all params in the configliere file."
+Settings.define_command :get,     :description => "show values given as commandline args, eg: #{File.basename($0)} get this that"
+Settings.define_command :set,     :description => "sets values given as commandline args, eg: #{File.basename($0)} set this=1 that=3"
+Settings.define_command :delete,  :description => "sets values given as commandline args, eg: #{File.basename($0)} delete this that"
+Settings.define_command :encrypt, :description => "encrypt the param"
+Settings.define_command :decrypt, :description => "Store the param as decrypted back into the file. Can be undone with 'encrypt'."
+
+Settings.define :from,   :flag => 'f', :type => :filename, :description => "Configliere config file to load"
+Settings.define :into,   :flag => 'i', :type => :filename, :description => "Configliere config file to save into"
+
+Settings.resolve!
+ARGV.replace []
+
+Store = Configliere.new
+Store.read(Settings.from) if Settings.from
+
+#
+# Execute
+#
+
+case Settings.command_name
+when :dump
+  puts Store.to_hash.to_yaml
+
+when :list
+  $stderr.puts "Param names in #{Settings.from}:"
+  Store.each do |attr, val|
+    puts "  #{attr}"
+  end
+
+when :get
+  $stderr.puts "Values for #{Settings.rest.join(", ")} from #{Settings.from}"
+  Settings.rest.map(&:to_sym).each do |attr|
+    puts "%-23s\t%s" % ["#{attr}:", Store[attr]]
+  end
+
+when :set
+  $stderr.puts "Setting #{Settings.rest.join(", ")} for #{Settings.from}"
+  Settings.rest.each do |attr_val|
+    attr, val = attr_val.split('=', 2)
+    attr = attr.to_sym
+    if val.nil? then warn "Please specify a value for #{attr}" ; next ; end
+    Store[attr] = val
+
+    puts "%-23s\t%s" % ["#{attr}:", val.inspect]
+  end
+
+when :delete
+  $stderr.puts "Deleting #{Settings.rest.join(", ")} from #{Settings.from}. O, I die, Horatio."
+  Settings.rest.map(&:to_sym).each do |attr|
+    Store.delete(attr)
+  end
+
+when :encrypt
+  Store.use :encrypted
+  $stderr.puts "Encrypting #{Settings.rest.join(", ")} from #{Settings.from}. Fnord"
+  Settings.rest.each{|attr| Store.define attr, :encrypted => true }
+  Store.encrypt_pass = Settings.encrypt_pass || Settings[:encrypt_pass]
+  Store.resolve!
+
+when :decrypt
+  Store.use :encrypted
+  $stderr.puts "Decrypting #{Settings.rest.join(", ")} from #{Settings.from}. Fnord"
+  Settings.rest.each{|attr| Store.define attr, :encrypted => true }
+  Store.encrypt_pass = Settings.encrypt_pass || Settings[:encrypt_pass]
+  Store.resolve!
+
+  puts Store.to_hash.to_yaml
+
+else
+  Settings.die "Please use one of the given commands"
+end
+
+if Settings.into
+  Store.save!(Settings.into)
+end

data/bin/configliere-delete

@@ -0,0 +1,85 @@
+#!/usr/bin/env ruby
+$: << File.dirname(__FILE__)+'/../lib'
+require 'configliere'
+
+Settings.use :commands
+
+Settings.description =  %Q{Client for the configliere gem: manipulate configuration and passwords for automated scripts}
+
+Settings.define_command :dump,    :description => "Show the whole contents of the file"
+Settings.define_command :list,    :description => "Show all params in the configliere file."
+Settings.define_command :get,     :description => "show values given as commandline args, eg: #{File.basename($0)} get this that"
+Settings.define_command :set,     :description => "sets values given as commandline args, eg: #{File.basename($0)} set this=1 that=3"
+Settings.define_command :delete,  :description => "sets values given as commandline args, eg: #{File.basename($0)} delete this that"
+Settings.define_command :encrypt, :description => "encrypt the param"
+Settings.define_command :decrypt, :description => "Store the param as decrypted back into the file. Can be undone with 'encrypt'."
+
+Settings.define :from,   :flag => 'f', :type => :filename, :description => "Configliere config file to load"
+Settings.define :into,   :flag => 'i', :type => :filename, :description => "Configliere config file to save into"
+
+Settings.resolve!
+ARGV.replace []
+
+Store = Configliere.new
+Store.read(Settings.from) if Settings.from
+
+#
+# Execute
+#
+
+case Settings.command_name
+when :dump
+  puts Store.to_hash.to_yaml
+
+when :list
+  $stderr.puts "Param names in #{Settings.from}:"
+  Store.each do |attr, val|
+    puts "  #{attr}"
+  end
+
+when :get
+  $stderr.puts "Values for #{Settings.rest.join(", ")} from #{Settings.from}"
+  Settings.rest.map(&:to_sym).each do |attr|
+    puts "%-23s\t%s" % ["#{attr}:", Store[attr]]
+  end
+
+when :set
+  $stderr.puts "Setting #{Settings.rest.join(", ")} for #{Settings.from}"
+  Settings.rest.each do |attr_val|
+    attr, val = attr_val.split('=', 2)
+    attr = attr.to_sym
+    if val.nil? then warn "Please specify a value for #{attr}" ; next ; end
+    Store[attr] = val
+
+    puts "%-23s\t%s" % ["#{attr}:", val.inspect]
+  end
+
+when :delete
+  $stderr.puts "Deleting #{Settings.rest.join(", ")} from #{Settings.from}. O, I die, Horatio."
+  Settings.rest.map(&:to_sym).each do |attr|
+    Store.delete(attr)
+  end
+
+when :encrypt
+  Store.use :encrypted
+  $stderr.puts "Encrypting #{Settings.rest.join(", ")} from #{Settings.from}. Fnord"
+  Settings.rest.each{|attr| Store.define attr, :encrypted => true }
+  Store.encrypt_pass = Settings.encrypt_pass || Settings[:encrypt_pass]
+  Store.resolve!
+
+when :decrypt
+  Store.use :encrypted
+  $stderr.puts "Decrypting #{Settings.rest.join(", ")} from #{Settings.from}. Fnord"
+  Settings.rest.each{|attr| Store.define attr, :encrypted => true }
+  Store.encrypt_pass = Settings.encrypt_pass || Settings[:encrypt_pass]
+  Store.resolve!
+
+  puts Store.to_hash.to_yaml
+
+else
+  Settings.die "Please use one of the given commands"
+end
+
+if Settings.into
+  Store.save!(Settings.into)
+end

data/bin/configliere-dump

@@ -0,0 +1,85 @@
+#!/usr/bin/env ruby
+$: << File.dirname(__FILE__)+'/../lib'
+require 'configliere'
+
+Settings.use :commands
+
+Settings.description =  %Q{Client for the configliere gem: manipulate configuration and passwords for automated scripts}
+
+Settings.define_command :dump,    :description => "Show the whole contents of the file"
+Settings.define_command :list,    :description => "Show all params in the configliere file."
+Settings.define_command :get,     :description => "show values given as commandline args, eg: #{File.basename($0)} get this that"
+Settings.define_command :set,     :description => "sets values given as commandline args, eg: #{File.basename($0)} set this=1 that=3"
+Settings.define_command :delete,  :description => "sets values given as commandline args, eg: #{File.basename($0)} delete this that"
+Settings.define_command :encrypt, :description => "encrypt the param"
+Settings.define_command :decrypt, :description => "Store the param as decrypted back into the file. Can be undone with 'encrypt'."
+
+Settings.define :from,   :flag => 'f', :type => :filename, :description => "Configliere config file to load"
+Settings.define :into,   :flag => 'i', :type => :filename, :description => "Configliere config file to save into"
+
+Settings.resolve!
+ARGV.replace []
+
+Store = Configliere.new
+Store.read(Settings.from) if Settings.from
+
+#
+# Execute
+#
+
+case Settings.command_name
+when :dump
+  puts Store.to_hash.to_yaml
+
+when :list
+  $stderr.puts "Param names in #{Settings.from}:"
+  Store.each do |attr, val|
+    puts "  #{attr}"
+  end
+
+when :get
+  $stderr.puts "Values for #{Settings.rest.join(", ")} from #{Settings.from}"
+  Settings.rest.map(&:to_sym).each do |attr|
+    puts "%-23s\t%s" % ["#{attr}:", Store[attr]]
+  end
+
+when :set
+  $stderr.puts "Setting #{Settings.rest.join(", ")} for #{Settings.from}"
+  Settings.rest.each do |attr_val|
+    attr, val = attr_val.split('=', 2)
+    attr = attr.to_sym
+    if val.nil? then warn "Please specify a value for #{attr}" ; next ; end
+    Store[attr] = val
+
+    puts "%-23s\t%s" % ["#{attr}:", val.inspect]
+  end
+
+when :delete
+  $stderr.puts "Deleting #{Settings.rest.join(", ")} from #{Settings.from}. O, I die, Horatio."
+  Settings.rest.map(&:to_sym).each do |attr|
+    Store.delete(attr)
+  end
+
+when :encrypt
+  Store.use :encrypted
+  $stderr.puts "Encrypting #{Settings.rest.join(", ")} from #{Settings.from}. Fnord"
+  Settings.rest.each{|attr| Store.define attr, :encrypted => true }
+  Store.encrypt_pass = Settings.encrypt_pass || Settings[:encrypt_pass]
+  Store.resolve!
+
+when :decrypt
+  Store.use :encrypted
+  $stderr.puts "Decrypting #{Settings.rest.join(", ")} from #{Settings.from}. Fnord"
+  Settings.rest.each{|attr| Store.define attr, :encrypted => true }
+  Store.encrypt_pass = Settings.encrypt_pass || Settings[:encrypt_pass]
+  Store.resolve!
+
+  puts Store.to_hash.to_yaml
+
+else
+  Settings.die "Please use one of the given commands"
+end
+
+if Settings.into
+  Store.save!(Settings.into)
+end