relevance_rails 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+*v0.2.1*
+* Replace testing with FakeFS with tempfiles.
+* Use 'bundle exec' in script/elzar\_nightly.
+
 *v0.2.0*
 
 * Depend on slushy for provisioning

data/lib/generators/provision_config/provision_config_generator.rb

@@ -102,12 +102,13 @@ To ensure you have remote access to your servers, an SSH public key must be avai
   end
 
   def local_keys
-    key_files = [
-      File.expand_path("~/.ssh/id_dsa.pub"),
+    default_keys.select { |p| File.exist?(p) }.take(1).map { |p| split_keys(File.read(p)) }.flatten(1)
+  end
+
+  def default_keys
+    [ File.expand_path("~/.ssh/id_dsa.pub"),
       File.expand_path("~/.ssh/id_ecdsa.pub"),
-      File.expand_path("~/.ssh/id_rsa.pub"),
-    ]
-    key_files.select { |p| File.exist?(p) }.take(1).map { |p| split_keys(File.read(p)) }.flatten(1)
+      File.expand_path("~/.ssh/id_rsa.pub") ]
   end
 
   def ssh_agent_keys

data/lib/relevance_rails/version.rb

@@ -1,3 +1,3 @@
 module RelevanceRails
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/relevance_rails.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'elzar', '~> 0.1.0'
 
   s.add_development_dependency 'capybara'
-  s.add_development_dependency 'fakefs'
   s.add_development_dependency 'guard-rspec'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rake', '~> 0.9.2.2'

data/script/elzar_nightly

@@ -24,8 +24,7 @@ rvm use "$CI_RUBY_VERSION@$CI_GEMSET"
 gem install bundler
 bundle install
 
-# DO NOT bundle exec rake - fakefs activation borks everything
-rake elzar_nightly
+bundle exec rake elzar_nightly
 
 [ $? -ne 0 ] && builtin cd $RAILS_APP && stop_server_and_exit
 

data/spec/lib/generators/provision_config/provision_config_generator_spec.rb

@@ -1,47 +1,44 @@
 require 'spec_helper'
-require 'fileutils'
-require 'fakefs/spec_helpers'
 require 'generators/provision_config/provision_config_generator'
+require 'tempfile'
 
 describe ProvisionConfigGenerator do
   subject { ProvisionConfigGenerator.new(["name"]) }
 
   describe "#local_keys" do
-    include FakeFS::SpecHelpers
-
-    def write_fixture(path, contents)
-      FileUtils.mkdir_p(File.dirname(path))
+    def write_fixture(name, contents)
+      path = Tempfile.new(name).path
+      subject.stub(:default_keys).and_return([path])
       File.open(path, "w") { |f| f.write(contents) }
+      path
     end
 
-    it "returns the contents of id_rsa.pub when it exists" do
-      write_fixture(File.expand_path("~/.ssh/id_rsa.pub"), "RSA-public-key")
-      subject.send(:local_keys).should == ["RSA-public-key"]
-    end
-
-    it "returns the contents of id_dsa.pub when it exists" do
-      write_fixture(File.expand_path("~/.ssh/id_dsa.pub"), "DSA-public-key")
-      subject.send(:local_keys).should == ["DSA-public-key"]
+    it 'has a sane default set of public keys to use' do
+      defaults = %w{id_ecdsa.pub id_dsa.pub id_rsa.pub}
+      defaults.map { |fname| File.expand_path("~/.ssh/#{fname}") }.each do |key|
+        subject.send(:default_keys).should include key
+      end
     end
 
-    it "returns the contents of id_ecdsa.pub when it exists" do
-      write_fixture(File.expand_path("~/.ssh/id_ecdsa.pub"), "ECDSA-public-key")
-      subject.send(:local_keys).should == ["ECDSA-public-key"]
+    it "returns the contents of the key when it exists" do
+      write_fixture('some-key.pub', 'RSA-public-key')
+      subject.send(:local_keys).should == ["RSA-public-key"]
     end
 
-    it "returns the contents of id_dsa.pub when both id_dsa.pub and id_rsa.pub exist" do
-      write_fixture(File.expand_path("~/.ssh/id_dsa.pub"), "DSA-public-key")
-      write_fixture(File.expand_path("~/.ssh/id_rsa.pub"), "RSA-public-key")
+    it "returns the contents of one key when multiple exist" do
+      dsa = write_fixture('id_dsa.pub', "DSA-public-key")
+      rsa = write_fixture('id_rsa.pub', "RSA-public-key")
+      subject.stub(:default_keys).and_return([dsa, rsa])
       subject.send(:local_keys).should == ["DSA-public-key"]
     end
 
     it "ignores trailing newlines" do
-      write_fixture(File.expand_path("~/.ssh/id_rsa.pub"), "RSA-public-key\n\n")
+      write_fixture('id_rsa.pub', "RSA-public-key\n\n")
       subject.send(:local_keys).should == ["RSA-public-key"]
     end
 
     it "ignores blank lines" do
-      write_fixture(File.expand_path("~/.ssh/id_rsa.pub"), "\n\nRSA-public-key\n\n\n")
+      write_fixture('id_rsa.pub', "\n\nRSA-public-key\n\n\n")
       subject.send(:local_keys).should == ["RSA-public-key"]
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relevance_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,27 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
+date: 2012-06-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &14982900 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.1
+  version_requirements: *14982900
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &14982400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.2'
+  version_requirements: *14982400
 - !ruby/object:Gem::Dependency
   name: slushy
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &14981940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.1
+  version_requirements: *14981940
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &14981480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,15 +54,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.14.6
+  version_requirements: *14981480
 - !ruby/object:Gem::Dependency
   name: elzar
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &14981000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -85,15 +65,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.0
+  version_requirements: *14981000
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &14980600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,31 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *14980600
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &14980100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,15 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *14980100
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &14979660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -149,15 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *14979660
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &14979140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,15 +109,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2.2
+  version_requirements: *14979140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &14978680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -181,12 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *14978680
 description: A Rails 3 wrapper which forces template use and includes a plethora of
   generators for standard Relevance bits.
 email:
@@ -253,27 +187,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3573380774667230504
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3573380774667230504
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Rails 3 Relevance style, with all infrastructure bits automated away.
-test_files:
-- spec/acceptance_spec.rb
-- spec/elzar_recipes_spec.rb
-- spec/lib/generators/provision_config/provision_config_generator_spec.rb
-- spec/lib/relevance_rails/runner_spec.rb
-- spec/spec_helper.rb
+test_files: []