vagrant-butter 0.0.2 → 0.0.3

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.rvmrc
+.rbx/

data/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2011 Fletcher Nichol
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,14 +1,30 @@
-# vagrant-butter
+# <a name="title"></a> vagrant-butter
 
-## Install
+## <a name="installation"></a> Installation
+
+Using Vagrant installed from package:
+
+```sh
+vagrant gem install vagrant-butter
+```
+
+Using Vagrant installed as a gem:
 
 ```sh
 gem install vagrant-butter
 ```
 
-## Helpers
+## <a name="middleware"></a> Middleware
 
-### local_ip
+#### <a name="middleware-sethostname"></a> SetHostName
+
+Sets a default host name based on the directory containing your
+`Vagrantfile`. For example a project in `/tmp/vagrant/chef-testing`
+will set the host name to `chef-testing.vagrantup.com`.
+
+## <a name="helpers"></a> Helpers
+
+### <a name="helpers-localip"></a> local_ip
 
 #### Usage
 
@@ -16,12 +32,41 @@ gem install vagrant-butter
 include Vagrant::Butter::Helpers
 ```
 
-## Patches and Support
+## <a name="patches"></a> Patches
 
-### SuSE Halting and Setting Hostname
+### <a name="patches-suse"></a> SuSE Halting and Setting Hostname
 
 #### Usage
 
 ```ruby
 require 'vagrant/butter/systems/suse'
 ```
+
+## <a name="development"></a> Development
+
+* Source hosted at [GitHub][repo]
+* Report issues/questions/feature requests on [GitHub Issues][issues]
+
+Pull requests are very welcome! Make sure your patches are well tested.
+Ideally create a topic branch for every separate change you make. For
+example:
+
+1. Fork the repo
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+## <a name="authors"></a> Authors
+
+Created and maintained by [Fletcher Nichol][fnichol] (<fnichol@nichol.ca>)
+
+## <a name="license"></a> License
+
+MIT (see [LICENSE][license])
+
+[license]:      https://github.com/fnichol/vagrant-butter/blob/master/LICENSE
+[fnichol]:      https://github.com/fnichol
+[repo]:         https://github.com/fnichol/vagrant-butter
+[issues]:       https://github.com/fnichol/vagrant-butter/issues
+[contributors]: https://github.com/fnichol/vagrant-butter/contributors

data/Rakefile

@@ -1,2 +1,12 @@
 #!/usr/bin/env rake
 require 'bundler/gem_tasks'
+
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs.push "lib"
+  t.test_files = FileList['spec/**/*_spec.rb']
+  t.verbose = true
+end
+
+task :default => 'test'

data/lib/vagrant-butter.rb

@@ -1,3 +1,4 @@
 # coding: utf-8
 
+require 'vagrant/butter/action/vm/set_host_name'
 require 'vagrant/butter/helpers'

data/lib/vagrant/butter/action/vm/set_host_name.rb

@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+
+module Vagrant
+  module Butter
+    module Action
+      module VM
+        class SetHostName
+          def initialize(app, env)
+            @app = app
+          end
+
+          def call(env)
+            if env[:vm].config.vm.host_name.nil?
+              host = File.basename(env[:vm].env.root_path).gsub(/_/, '-')
+              env[:vm].config.vm.host_name = "#{host}.vagrantup.com"
+            end
+
+            @app.call(env)
+          end
+        end
+      end
+    end
+  end
+end
+
+Vagrant.actions[:start].
+  insert_before(Vagrant::Action::VM::HostName, Vagrant::Butter::Action::VM::SetHostName)

data/lib/vagrant/butter/version.rb

@@ -2,6 +2,6 @@
 
 module Vagrant
   module Butter
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/vagrant/butter/action/vm/set_host_name_spec.rb

@@ -0,0 +1,48 @@
+# -*- encoding: utf-8 -*-
+require 'minitest/autorun'
+require 'mocha'
+require 'vagrant'
+require 'vagrant/butter/action/vm/set_host_name'
+
+describe Vagrant::Butter::Action::VM::SetHostName do
+  include Vagrant::TestHelpers
+
+  let(:middleware)  { Vagrant::Butter::Action::VM::SetHostName.new(@app, @env) }
+  let(:host_name)   { @env["vm"].config.vm.host_name }
+
+  def stub_root_path!(path)
+    @env[:vm].env.stubs(:root_path).returns(Pathname.new(path))
+  end
+
+  before do
+    @app, @env = action_env
+  end
+
+  it "invokes the next middleware" do
+    @app.expects(:call).with(@env).once
+
+    middleware.call(@env)
+  end
+
+  it "sets host name to the current working directory name" do
+    stub_root_path! "/tmp/vagrant/myhost"
+    middleware.call(@env)
+
+    host_name.must_equal "myhost.vagrantup.com"
+  end
+
+  it "replaces underscores with dashes" do
+    stub_root_path! "/vagrants/the_dude_app_1"
+    middleware.call(@env)
+
+    host_name.must_equal "the-dude-app-1.vagrantup.com"
+  end
+
+  it "uses the host name from a Vagrantfile over default" do
+    stub_root_path! "/tmp/vagrant/fuzzypants"
+    @env[:vm].config.vm.host_name = "buzzkill.example.com"
+    middleware.call(@env)
+
+    host_name.must_equal "buzzkill.example.com"
+  end
+end

data/vagrant-butter.gemspec

@@ -15,5 +15,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = Vagrant::Butter::VERSION
 
-  gem.add_dependency "vagrant", "~> 0"
+  gem.add_dependency "vagrant", "~> 1.0.0"
+
+  gem.add_development_dependency "minitest", "~> 2.12.0"
+  gem.add_development_dependency "mocha"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-butter
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,41 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-05 00:00:00.000000000 Z
+date: 2012-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant
-  requirement: &2157134260 !ruby/object:Gem::Requirement
+  requirement: &70191129620780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157134260
+  version_requirements: *70191129620780
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70191129620280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+  type: :development
+  prerelease: false
+  version_requirements: *70191129620280
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70191129619880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70191129619880
 description: Smooth out Vagrantfiles with some common helpers and shims
 email:
 - fnichol@nichol.ca
@@ -31,13 +53,16 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - lib/vagrant-butter.rb
+- lib/vagrant/butter/action/vm/set_host_name.rb
 - lib/vagrant/butter/helpers.rb
 - lib/vagrant/butter/systems/suse.rb
 - lib/vagrant/butter/version.rb
 - lib/vagrant_init.rb
+- spec/vagrant/butter/action/vm/set_host_name_spec.rb
 - vagrant-butter.gemspec
 homepage: https://github.com/fnichol/vagrant-butter#readme
 licenses: []
@@ -53,7 +78,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3594635565780566737
+      hash: -4045232948945146367
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -62,11 +87,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3594635565780566737
+      hash: -4045232948945146367
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Smooth out Vagrantfiles with some common helpers and shims
-test_files: []
+test_files:
+- spec/vagrant/butter/action/vm/set_host_name_spec.rb