bcdatabase 1.0.2 → 1.0.3

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+1.0.3
+=====
+- Support ActiveSupport 3.  ActiveSupport 2 continues to work.
+
 1.0.2
 =====
 - Tighten up gemspec gem deps.  Bcdatabase does not currently work

data/README.markdown

@@ -5,8 +5,6 @@ bcdatabase
 
 ## Installing bcdatabase
 
-Ensure that [gemcutter](http://gemcutter.org) is in your gem sources list, then:
-
     $ gem install bcdatabase
 
 ## Using bcdatabase to configure the database for a Rails application

data/lib/bcdatabase.rb

@@ -4,10 +4,6 @@ require 'digest/sha2'
 require 'base64'
 
 module Bcdatabase
-  VERSION = begin
-    config = YAML.load(File.read(File.expand_path('../VERSION.yml', File.dirname(__FILE__))))
-    [config[:major], config[:minor], config[:patch]].join('.')
-  end
   DEFAULT_BASE_PATH = File.join('/', 'etc', 'nubic', 'db')
   DEFAULT_PASS_FILE = File.join('/', 'var', 'lib', 'nubic', 'db.pass')
   CIPHER = 'aes-256-ecb'
@@ -113,4 +109,4 @@ module Bcdatabase
   end
 
   class Error < Exception; end
-end unless defined?(Bcdatabase)
+end

data/lib/bcdatabase/version.rb

@@ -0,0 +1,3 @@
+module Bcdatabase
+  VERSION = '1.0.3'
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bcdatabase
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Rhett Sutphin
@@ -15,23 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-08 00:00:00 -05:00
-default_executable: bcdatabase
+date: 2011-02-03 00:00:00 -06:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 3
         segments: 
-        - 1
         - 2
-        version: "1.2"
-  type: :development
+        - 0
+        version: "2.0"
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: highline
@@ -49,19 +49,19 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 11
         segments: 
+        - 1
         - 2
-        - 0
-        version: "2.0"
-  type: :runtime
+        version: "1.2"
+  type: :development
   version_requirements: *id003
 description: bcdatabase is a tool for storing passwords and other database configuration information outside of your application source tree.
 email: rhett@detailedbalance.net
@@ -69,30 +69,23 @@ executables:
 - bcdatabase
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.markdown
+extra_rdoc_files: []
+
 files: 
-- .gitignore
-- .rvmrc
 - CHANGELOG.markdown
 - LICENSE
 - README.markdown
-- Rakefile
-- VERSION.yml
 - bin/bcdatabase
-- lib/bcdatabase.rb
 - lib/bcdatabase/commands.rb
-- spec/bcdatabase/commands_spec.rb
-- spec/bcdatabase_spec.rb
-- spec/spec_helper.rb
+- lib/bcdatabase/version.rb
+- lib/bcdatabase.rb
 has_rdoc: true
 homepage: http://github.com/rsutphin/bcdatabase
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -116,11 +109,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Server-central database configuration for rails and other ruby apps
-test_files: 
-- spec/bcdatabase/commands_spec.rb
-- spec/bcdatabase_spec.rb
-- spec/spec_helper.rb
+test_files: []
+

data/.gitignore

@@ -1,3 +0,0 @@
-*.gemspec
-pkg
-coverage

data/.rvmrc

@@ -1,2 +0,0 @@
-rvm use ruby-1.8.7@bcdatabase
-

data/Rakefile

@@ -1,53 +0,0 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "bcdatabase"
-    gem.summary = %Q{Server-central database configuration for rails and other ruby apps}
-    gem.description = %Q{bcdatabase is a tool for storing passwords and other database configuration information outside of your application source tree.}
-    gem.email = "rhett@detailedbalance.net"
-    gem.homepage = "http://github.com/rsutphin/bcdatabase"
-    gem.authors = ["Rhett Sutphin"]
-    gem.add_development_dependency 'rspec', ">= 1.2"
-    gem.add_dependency 'highline', '~> 1.6'
-    gem.add_dependency 'activesupport', '~> 2.0'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-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'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-  # rcov can't tell that /Library/Ruby is a system path
-  spec.rcov_opts = ['--exclude', "spec/*,/Library/Ruby/*"]
-end
-
-task :spec => :check_dependencies
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "schema_qualified_tables #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-# Disable github release since I don't want to commit the gemspec
-Rake::Task[:release].prerequisites.delete 'github:release'
-
-task :build => [:gemspec]

data/VERSION.yml

@@ -1,5 +0,0 @@
---- 
-:major: 1
-:minor: 0
-:build: 
-:patch: 2

data/spec/bcdatabase/commands_spec.rb

@@ -1,55 +0,0 @@
-require File.expand_path("../spec_helper", File.dirname(__FILE__))
-
-require "bcdatabase/commands"
-
-describe "CLI: bcdatabase" do
-  before(:each) do
-    ENV["BCDATABASE_PATH"] = "/tmp/bcdb_specs"
-    FileUtils.mkdir_p ENV["BCDATABASE_PATH"]
-  end
-
-  after(:each) do
-    FileUtils.rm_rf ENV["BCDATABASE_PATH"]
-    ENV["BCDATABASE_PATH"] = nil
-  end
-
-  describe "encrypt" do
-    before do
-      enable_fake_cipherment
-    end
-
-    after do
-      disable_fake_cipherment
-    end
-
-    def bcdatabase_encrypt(infile)
-      StringIO.open("", "w") do |io|
-        $stdout = io
-        Bcdatabase::Commands::Encrypt.new([File.join(ENV["BCDATABASE_PATH"], infile)]).main
-        $stdout = STDOUT
-        YAML::load(io.string)
-      end
-    end
-
-    it "replaces password: clauses with epasswords" do
-      temporary_yaml "plain", {
-        "single" =>  {
-          "password" => 'zanzibar'
-        }
-      }
-
-      bcdatabase_encrypt('plain.yaml')['single']['epassword'].should == 'rabiznaz'
-      bcdatabase_encrypt('plain.yaml')['single']['password'].should be_nil
-    end
-
-    it "leaves existing epasswords alone" do
-      temporary_yaml "plain", {
-        "single" =>  {
-          "epassword" => 'etalocohc'
-        }
-      }
-
-      bcdatabase_encrypt('plain.yaml')['single']['epassword'].should == 'etalocohc'
-    end
-  end
-end

data/spec/bcdatabase_spec.rb

@@ -1,264 +0,0 @@
-require File.expand_path("spec_helper", File.dirname(__FILE__))
-
-describe Bcdatabase do
-  it "should have a d.d.d version" do
-    Bcdatabase::VERSION.should =~ /^\d+\.\d+\.\d+$/
-  end
-
-  before(:each) do
-    ENV["BCDATABASE_PATH"] = "/tmp/bcdb_specs"
-    FileUtils.mkdir_p ENV["BCDATABASE_PATH"]
-  end
-
-  after(:each) do
-    FileUtils.rm_rf ENV["BCDATABASE_PATH"]
-    ENV["BCDATABASE_PATH"] = nil
-  end
-
-  describe "cipherment" do
-    before(:all) do
-      keyfile = "/tmp/bcdb-spec-key"
-      open(keyfile, 'w') { |f| f.write "01234567890123456789012345678901" }
-      ENV["BCDATABASE_PASS"] = keyfile
-    end
-
-    after(:all) do
-      FileUtils.rm ENV["BCDATABASE_PASS"]
-      ENV["BCDATABASE_PASS"] = nil
-    end
-
-    it "should be reversible" do
-      e = Bcdatabase.encrypt("riboflavin")
-      Bcdatabase.decrypt(e).should == "riboflavin"
-    end
-
-    it "should permute the input" do
-      Bcdatabase.encrypt("zanzibar").should_not == "zanzibar"
-    end
-
-    it "should do more than just encode" do
-      Bcdatabase.encrypt("zanzibar").should_not == Base64.encode64("zanzibar")
-    end
-  end
-
-  describe "loading" do
-    it "should read simple YAML" do
-      temporary_yaml "simple", {
-        "single" =>  {
-          "adapter" => "foo", "username" => "baz"
-        }
-      }
-      bcdb = Bcdatabase.load
-      bcdb[:simple, :single]['adapter'].should == "foo"
-      bcdb[:simple, :single]['username'].should == "baz"
-    end
-
-    it "should read and expose multiple groups from multiple files" do
-      temporary_yaml "one", {
-        "first" => { "dc" => "etc" }
-      }
-      temporary_yaml "two", {
-        "fourth" => { "dc" => "etc" }
-      }
-      bcdb = Bcdatabase.load
-      bcdb['one', 'first'].should_not be_nil
-      bcdb['two', 'fourth'].should_not be_nil
-    end
-
-    it "should merge defaults from 'defaults'" do
-      temporary_yaml "defaulted", {
-        "defaults" => {
-          "database" => "postgresql"
-        },
-        "real" => {
-          "password" => "frood"
-        }
-      }
-      bcdb = Bcdatabase.load
-      bcdb['defaulted', 'real']['password'].should == 'frood'
-      bcdb['defaulted', 'real']['database'].should == 'postgresql'
-    end
-
-    it "should merge defaults from 'default'" do
-      temporary_yaml "singular", {
-        "default" => {
-          "adapter" => "three-eighths"
-        },
-        "real" => {
-          "password" => "frood"
-        }
-      }
-      bcdb = Bcdatabase.load
-      bcdb['singular', 'real']['adapter'].should == 'three-eighths'
-    end
-
-    it "should preserve values overridden from defaults" do
-      temporary_yaml "jam", {
-        "default" => {
-          "adapter" => "three-eighths"
-        },
-        "standard" => {
-          "password" => "frood"
-        },
-        "custom" => {
-          "adapter" => "five-sixteenths",
-          "password" => "lazlo"
-        }
-      }
-      bcdb = Bcdatabase.load
-      bcdb['jam', 'standard']['adapter'].should == 'three-eighths'
-      bcdb['jam', 'custom']['adapter'].should == 'five-sixteenths'
-    end
-
-    it "should default the username to the entry name" do
-      temporary_yaml "scran", {
-        "jim" => { "password" => "leather" }
-      }
-      bcdb = Bcdatabase.load
-      bcdb['scran', 'jim']['username'].should == 'jim'
-      bcdb['scran', 'jim']['password'].should == 'leather'
-    end
-
-    it "should default the database name to the entry name" do
-      temporary_yaml "scran", {
-        "jim" => { "password" => "leather" }
-      }
-      bcdb = Bcdatabase.load
-      bcdb['scran', 'jim']['database'].should == 'jim'
-      bcdb['scran', 'jim']['password'].should == 'leather'
-    end
-
-    it "should not default the database name if there's an explicit database name" do
-      temporary_yaml "scran", {
-        "jim" => {
-          "password" => "leather",
-          "database" => "james"
-        }
-      }
-      bcdb = Bcdatabase.load
-      bcdb['scran', 'jim']['database'].should == 'james'
-      bcdb['scran', 'jim']['password'].should == 'leather'
-    end
-
-    it "should not default the database name to the entry name if there's a default database name" do
-      temporary_yaml "scran", {
-        "default" => {
-          "database" => "//localhost:345/etc"
-        },
-        "jim" => {
-          "password" => "leather",
-        }
-      }
-      bcdb = Bcdatabase.load
-      bcdb['scran', 'jim']['database'].should == '//localhost:345/etc'
-      bcdb['scran', 'jim']['password'].should == 'leather'
-    end
-
-    it "should use an explicit username instead of the entry name if provided" do
-      temporary_yaml "scran", {
-        "jim" => {
-          "username" => "james",
-          "password" => "earldom"
-        }
-      }
-      bcdb = Bcdatabase.load
-      bcdb['scran', 'jim']['username'].should == 'james'
-      bcdb['scran', 'jim']['password'].should == 'earldom'
-    end
-
-    describe "with encrypted passwords" do
-      before do
-        enable_fake_cipherment
-      end
-
-      after do
-        disable_fake_cipherment
-      end
-
-      it "should decrypt and expose the password" do
-        temporary_yaml "secure", {
-          "safe" => {
-            "epassword" => "moof"
-          }
-        }
-        bcdb = Bcdatabase.load
-        bcdb['secure', 'safe']['password'].should == "foom"
-      end
-
-      it "should prefer the decrypted version of an epassword" do
-        temporary_yaml "secure", {
-          "safe" => {
-            "password" => "fake",
-            "epassword" => "moof"
-          }
-        }
-        bcdb = Bcdatabase.load
-        bcdb['secure', 'safe']['password'].should == "foom" # not "fake"
-      end
-    end
-  end
-
-  describe "for database.yml" do
-    before do
-      temporary_yaml "scran", {
-        "jim" => {
-          "username" => "james",
-          "password" => "earldom"
-        },
-
-        "dwide" => {
-          "username" => "dwight",
-          "password" => "help"
-        }
-      }
-      @bcdb = Bcdatabase.load
-    end
-
-    describe "the yaml for a valid reference" do
-      before do
-        @yaml = @bcdb.development(:scran, :jim)
-        @actual = YAML.load(@yaml)
-      end
-
-      it "isn't a separated YAML doc" do
-        @yaml.should_not =~ /---/
-      end
-
-      it "has a single top-level key" do
-        @actual.keys.should have(1).key
-        @actual.should have_key("development")
-      end
-
-      it "reflects the selected configuration" do
-        @actual['development']['username'].should == 'james'
-        @actual['development']['password'].should == 'earldom'
-      end
-    end
-
-    describe "an invalid reference" do
-      before do
-        ::RAILS_ENV = "staging"
-      end
-
-      after do
-        Object.class_eval { remove_const "RAILS_ENV" }
-      end
-
-      describe "for the current RAILS_ENV" do
-        it "allows the exception through" do
-          lambda { @bcdb.staging(:scran, :phil) }.should raise_error
-        end
-      end
-
-      describe "for a different RAILS_ENV" do
-        it "does not throw an exception" do
-          lambda { @bcdb.production(:scran, :phil) }.should_not raise_error
-        end
-
-        it "includes the error in the resulting hash" do
-          @bcdb.production(:scran, :phil).should =~ / error: No database entry for \"phil\" in scran/
-        end
-      end
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,32 +0,0 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'bcdatabase'
-require 'rubygems'
-require 'fileutils'
-
-def temporary_yaml(name, hash)
-  filename = "/#{ENV['BCDATABASE_PATH']}/#{name}.yaml"
-  open(filename, "w") { |f| YAML.dump(hash, f) }
-  filename
-end
-
-def enable_fake_cipherment
-  # replace real encryption methods with something predictable
-  Bcdatabase.module_eval do
-    class << self
-      alias :encrypt_original :encrypt
-      alias :decrypt_original :decrypt
-      def encrypt(s); s.reverse; end
-      def decrypt(s); s.reverse; end
-    end
-  end
-end
-
-def disable_fake_cipherment
-  Bcdatabase.module_eval do
-    class << self
-      alias :encrypt :encrypt_original
-      alias :decrypt :decrypt_original
-    end
-  end
-end