rsettings 0.4.0 → 0.5.0

data/lib/rsettings/core/names.rb

@@ -1,21 +1,21 @@
-class Names
-  require "audible"; include Audible
-  
-  def initialize
-    @opts = {}
-  end
-
-  def add(opts={})
-    notify :adding, opts
-    @opts.merge!(opts.invert)
-  end
-
-  def for(setting)
-    notify :finding, setting
-    @opts[setting.to_s] || @opts[setting.to_sym] || setting
-  end
-
-  def reverse_for(name)
-    @opts.invert[name.value] || name.value
-  end
-end
+class Names
+  require "audible"; include Audible
+  
+  def initialize
+    @opts = {}
+  end
+
+  def add(opts={})
+    notify :adding, opts
+    @opts.merge!(opts.invert)
+  end
+
+  def for(setting)
+    notify :finding, setting
+    @opts[setting.to_s] || @opts[setting.to_sym] || setting
+  end
+
+  def reverse_for(name)
+    @opts.invert[name.value] || name.value
+  end
+end

data/lib/rsettings/core/rsettings.rb

@@ -1,29 +1,29 @@
-class RSettings
-  require "audible"; include Audible
-
-  def initialize(opts={})
-    @settings,@names = opts[:settings],opts[:names] 
-  end
-
-  def find(m)
-    query = m.to_s.end_with? "?"
-
-    m = m.to_s.delete "?" if query
-
-    name = ConvertibleSettingName.new(@names, m)
-    
-    if query
-      value = @settings.get(name)
-
-      fail "Unable to convert setting <#{name.value}> to flag" unless value.truthy?
-      
-      return value.to_s.downcase === "yes"
-    end
-
-    notify :finding, m, name
-
-    result = @settings.get(name)
-
-    result.missing? ? nil : result.to_s
-  end
-end
+class RSettings
+  require "audible"; include Audible
+
+  def initialize(opts={})
+    @settings,@names = opts[:settings],opts[:names] 
+  end
+
+  def find(m)
+    query = m.to_s.end_with? "?"
+
+    m = m.to_s.delete "?" if query
+
+    name = ConvertibleSettingName.new(@names, m)
+    
+    if query
+      value = @settings.get(name)
+
+      fail "Unable to convert setting <#{name.value}> to flag" unless value.truthy?
+      
+      return value.true?
+    end
+
+    notify :finding, m, name
+
+    result = @settings.get(name)
+
+    result.missing? ? nil : result.to_s
+  end
+end

data/lib/rsettings/core/setting.rb

@@ -1,12 +1,16 @@
-class Setting
-  def truthy?; @truthy; end
-  
-  def initialize(text="")
-    @text = text
-    @truthy = (text||"").downcase.match /(yes|no)/
-  end
-
-  def missing?; @text.nil?; end
-
-  def to_s; @text.to_s; end
-end
+class Setting
+  def truthy?; @truthy; end
+  
+  def initialize(text="")
+    @text = text
+    @truthy = (text||"").downcase.match /(yes|no|on|off)/
+  end
+
+  def missing?; @text.nil?; end
+
+  def to_s; @text.to_s; end
+  
+  def true?
+    (@text||"").downcase.match /(yes|on)/
+  end 
+end

data/lib/rsettings/core/setting_name.rb

@@ -1,15 +1,15 @@
-class SettingName
-  attr_reader :value
-
-  def initialize(name)
-    @value = name
-  end
-end
-
-class ConvertibleSettingName
-  def initialize(names, name)
-    @name,@names = name,names
-  end
-  
-  def value; @names.for @name; end
-end
+class SettingName
+  attr_reader :value
+
+  def initialize(name)
+    @value = name
+  end
+end
+
+class ConvertibleSettingName
+  def initialize(names, name)
+    @name,@names = name,names
+  end
+  
+  def value; @names.for @name; end
+end

data/lib/rsettings.rb

@@ -1,46 +1,46 @@
-dir = File.join(File.dirname(__FILE__))
-
-Dir.glob(File.join(dir, "rsettings", "**", "*.rb")).each {|f| require f}
-
-class Settings
-  def initialize(&block)
-    @conf = SettingsConfiguration.new &block
-  end
-
-  def method_missing(m, *args, &block)
-    fail "Only support queries, cannot do command <#{m}>" unless args.empty?
-
-    rsettings = RSettings.new(
-      :settings => @conf.settings,
-      :names => @conf.names
-    )
-
-    Probe.new rsettings
-
-    rsettings.find m
-  end
-end
-
-class Probe
-  def initialize(names)
-    names.on :finding do |e,args|
-      Log.info "[RSettings] Finding setting for <#{args.first}> by name <#{args[1].value}>"
-    end
-  end
-end
-
-class ConsoleLog
-  class << self
-    def info(what)
-      puts "[INFO] #{what}"
-    end
-  end
-end
-
-class DevNullLog
-  class << self
-    def info(what); end
-  end
-end
-
-Log = ENV["LOUD"] == "on" ? ConsoleLog : DevNullLog
+dir = File.join(File.dirname(__FILE__))
+
+Dir.glob(File.join(dir, "rsettings", "**", "*.rb")).each {|f| require f}
+
+class Settings
+  def initialize(&block)
+    @conf = SettingsConfiguration.new &block
+  end
+
+  def method_missing(m, *args, &block)
+    fail "Only support queries, cannot do command <#{m}>" unless args.empty?
+
+    rsettings = RSettings.new(
+      :settings => @conf.settings,
+      :names => @conf.names
+    )
+
+    Probe.new rsettings
+
+    rsettings.find m
+  end
+end
+
+class Probe
+  def initialize(names)
+    names.on :finding do |e,args|
+      Log.info "[RSettings] Finding setting for <#{args.first}> by name <#{args[1].value}>"
+    end
+  end
+end
+
+class ConsoleLog
+  class << self
+    def info(what)
+      puts "[INFO] #{what}"
+    end
+  end
+end
+
+class DevNullLog
+  class << self
+    def info(what); end
+  end
+end
+
+Log = ENV["LOUD"] == "on" ? ConsoleLog : DevNullLog

data/rsettings.gemspec

@@ -1,77 +1,79 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "rsettings"
-  s.version = "0.4.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ben Biddington"]
-  s.date = "2013-12-16"
-  s.description = "Settings"
-  s.email = "ben.biddington@gmail.com"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".travis.yml",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "lib/rsettings.rb",
-    "lib/rsettings/adapters/basic_disk_settings.rb",
-    "lib/rsettings/adapters/environment_settings.rb",
-    "lib/rsettings/core/internal/defaults.rb",
-    "lib/rsettings/core/internal/settings_chain.rb",
-    "lib/rsettings/core/internal/settings_configuration.rb",
-    "lib/rsettings/core/missing.rb",
-    "lib/rsettings/core/names.rb",
-    "lib/rsettings/core/rsettings.rb",
-    "lib/rsettings/core/setting.rb",
-    "lib/rsettings/core/setting_name.rb",
-    "rsettings.gemspec",
-    "spec/integration.tests/adapters/basic_disk_settings_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/system.tests/can_fall_back_to_file_settings_spec.rb",
-    "spec/system.tests/can_specify_flags_spec.rb",
-    "spec/system.tests/can_supply_defaults_for_missing_settings_spec.rb",
-    "spec/system.tests/can_use_env_spec.rb",
-    "spec/system.tests/options_spec.rb"
-  ]
-  s.homepage = "http://github.com/ben-biddington/rsettings"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
-  s.summary = "Settings for ruby programs"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<audible>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
-    else
-      s.add_dependency(%q<audible>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-    end
-  else
-    s.add_dependency(%q<audible>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-  end
-end
-
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+# stub: rsettings 0.5.0 ruby lib
+
+Gem::Specification.new do |s|
+  s.name = "rsettings"
+  s.version = "0.5.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Ben Biddington"]
+  s.date = "2013-12-23"
+  s.description = "Settings"
+  s.email = "ben.biddington@gmail.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    ".travis.yml",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "lib/rsettings.rb",
+    "lib/rsettings/adapters/basic_disk_settings.rb",
+    "lib/rsettings/adapters/environment_settings.rb",
+    "lib/rsettings/core/internal/defaults.rb",
+    "lib/rsettings/core/internal/settings_chain.rb",
+    "lib/rsettings/core/internal/settings_configuration.rb",
+    "lib/rsettings/core/missing.rb",
+    "lib/rsettings/core/names.rb",
+    "lib/rsettings/core/rsettings.rb",
+    "lib/rsettings/core/setting.rb",
+    "lib/rsettings/core/setting_name.rb",
+    "rsettings.gemspec",
+    "spec/integration.tests/adapters/basic_disk_settings_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/system.tests/can_fall_back_to_file_settings_spec.rb",
+    "spec/system.tests/can_provide_translations_spec.rb",
+    "spec/system.tests/can_specify_flags_spec.rb",
+    "spec/system.tests/can_supply_defaults_for_missing_settings_spec.rb",
+    "spec/system.tests/can_use_env_spec.rb",
+    "spec/system.tests/options_spec.rb"
+  ]
+  s.homepage = "http://github.com/ben-biddington/rsettings"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "2.1.11"
+  s.summary = "Settings for ruby programs"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<audible>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+    else
+      s.add_dependency(%q<audible>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    end
+  else
+    s.add_dependency(%q<audible>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+  end
+end
+

data/spec/integration.tests/adapters/basic_disk_settings_spec.rb

@@ -1,46 +1,46 @@
-require "spec_helper"
-
-describe BasicDiskSettings do
-  let(:settings) {BasicDiskSettings.new}
-
-  before do
-    settings.clear
-  end
-
-  let(:a) { SettingName.new :a}
-  let(:b) { SettingName.new :b}
-
-  it "can store single setting" do
-    settings.set :a => "value"
-
-    expect(settings.get(a).to_s).to eql "value"
-  end
-
-  it "can store multiple settings at once" do
-    settings.set :a => "value a", :b => "value b"
-
-    expect(settings.get(a).to_s).to eql "value a"
-    expect(settings.get(b).to_s).to eql "value b"
-  end
-
-  it "overwrites duplicates" do
-    settings.set :a => "value a"
-    settings.set :a => "another value for a"
-
-    expect(settings.get(a).to_s).to eql "another value for a"
-  end
-  
-  it "overwrites duplicates even when setting the same setting" do
-    settings.set :a => "value a", :a => "another value for a"
-
-    expect(settings.get(a).to_s).to eql "another value for a"
-  end
-
-  it "records all settings when you call set multiple times" do
-    settings.set :a => "value a"
-    settings.set :b => "value b"
-
-    expect(settings.get(a).to_s).to_not be_nil
-    expect(settings.get(b).to_s).to_not be_nil
-  end
-end
+require "spec_helper"
+
+describe BasicDiskSettings do
+  let(:settings) {BasicDiskSettings.new}
+
+  before do
+    settings.clear
+  end
+
+  let(:a) { SettingName.new :a}
+  let(:b) { SettingName.new :b}
+
+  it "can store single setting" do
+    settings.set :a => "value"
+
+    expect(settings.get(a).to_s).to eql "value"
+  end
+
+  it "can store multiple settings at once" do
+    settings.set :a => "value a", :b => "value b"
+
+    expect(settings.get(a).to_s).to eql "value a"
+    expect(settings.get(b).to_s).to eql "value b"
+  end
+
+  it "overwrites duplicates" do
+    settings.set :a => "value a"
+    settings.set :a => "another value for a"
+
+    expect(settings.get(a).to_s).to eql "another value for a"
+  end
+  
+  it "overwrites duplicates even when setting the same setting" do
+    settings.set :a => "value a", :a => "another value for a"
+
+    expect(settings.get(a).to_s).to eql "another value for a"
+  end
+
+  it "records all settings when you call set multiple times" do
+    settings.set :a => "value a"
+    settings.set :b => "value b"
+
+    expect(settings.get(a).to_s).to_not be_nil
+    expect(settings.get(b).to_s).to_not be_nil
+  end
+end

data/spec/spec_helper.rb

@@ -1,2 +1,2 @@
-require "rspec"
-require "rsettings"
+require "rspec"
+require "rsettings"

data/spec/system.tests/can_fall_back_to_file_settings_spec.rb

@@ -1,56 +1,56 @@
-require "spec_helper"
-
-describe "a settings fallback" do
-  before do
-    ENV.clear
-
-    @disk_settings = BasicDiskSettings.new do
-      clear
-      set :jazzs_bike_shorts => "tight"
-    end
-  end
-
-  let (:settings) do 
-    Settings.new do
-      with_settings :chain => [EnvironmentSettings, BasicDiskSettings]
-    end
-  end
-
-  let (:disk_settings) do
-    @disk_settings
-  end
-
-  it "for example, you can fall back to a setting on disk" do
-    expect(settings.jazzs_bike_shorts).to eql "tight"
-  end
-
-  it "you get the environment setting when it exists" do
-    ENV["jazzs_bike_shorts"] = "this is from the environment variables"
-
-    expect(settings.jazzs_bike_shorts).to eql "this is from the environment variables"
-  end
-
-  it "you can fallback one and not another" do
-    ENV["b"] = "env b"
-
-    disk_settings.clear
-    disk_settings.set :a => "disk a", :b => "disk b"
-
-    expect(settings.a).to eql "disk a"
-    expect(settings.b).to eql "env b"
-  end
-
-  it "you can use ONLY disk if you like" do
-    settings = Settings.new do
-      with_settings BasicDiskSettings
-    end
-
-    ENV["ben_rules"] = "expect this to be ignored"
-
-    disk_settings.clear
-    disk_settings.on(:set){|e,args| puts args.first}
-    disk_settings.set :ben_rules => "yes"
-
-    expect(settings.ben_rules).to eql "yes"
-  end
-end
+require "spec_helper"
+
+describe "a settings fallback" do
+  before do
+    ENV.clear
+
+    @disk_settings = BasicDiskSettings.new do
+      clear
+      set :jazzs_bike_shorts => "tight"
+    end
+  end
+
+  let (:settings) do 
+    Settings.new do
+      with_settings :chain => [EnvironmentSettings, BasicDiskSettings]
+    end
+  end
+
+  let (:disk_settings) do
+    @disk_settings
+  end
+
+  it "for example, you can fall back to a setting on disk" do
+    expect(settings.jazzs_bike_shorts).to eql "tight"
+  end
+
+  it "you get the environment setting when it exists" do
+    ENV["jazzs_bike_shorts"] = "this is from the environment variables"
+
+    expect(settings.jazzs_bike_shorts).to eql "this is from the environment variables"
+  end
+
+  it "you can fallback one and not another" do
+    ENV["b"] = "env b"
+
+    disk_settings.clear
+    disk_settings.set :a => "disk a", :b => "disk b"
+
+    expect(settings.a).to eql "disk a"
+    expect(settings.b).to eql "env b"
+  end
+
+  it "you can use ONLY disk if you like" do
+    settings = Settings.new do
+      with_settings BasicDiskSettings
+    end
+
+    ENV["ben_rules"] = "expect this to be ignored"
+
+    disk_settings.clear
+    disk_settings.on(:set){|e,args| puts args.first}
+    disk_settings.set :ben_rules => "yes"
+
+    expect(settings.ben_rules).to eql "yes"
+  end
+end