vagrant-managed-servers 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6a1b76e306ac8fb21d3c2021eefdac95a8dd9b9c
+  data.tar.gz: aad778f3db1ecfc8bd1a74da50f75bc0045ab844
+SHA512:
+  metadata.gz: c44804a7a2ad803407d3b3a96d93d720346c426c666847652b36c5547f7e0a26e4a8b4577dd796c76bee48fefd9357755de2d4e7c346f5fcdd63254eb1d84092
+  data.tar.gz: fdd8df74d92ea2c4635028a34ccdb03673109375c981025e80f9e80928246d6967ec08fe423323647f7e5b4a4fb6999bb63b0b2e1aed4c7085a7933ef0a02a1f

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.3
+  - 2.0.0
 script:
   - rake spec

data/Berksfile

@@ -1,4 +1,4 @@
-source "https://api.berkshelf.com"
+source "https://supermarket.getchef.com"
 
 cookbook 'apt'
 cookbook 'apache2'

data/CHANGELOG.md

@@ -1,10 +1,20 @@
 
-# 0.2.0 (unreleased)
+# Changelog
+
+## 0.3.0 (released 2014-08-23)
+
+Updates for improving the experience with Vagrant 1.5+ (but still keeping backwards-compatibility with 1.2):
+
+* fix warning when using Vagrant > 1.5 ([#19](https://github.com/tknerr/vagrant-managed-servers/issues/19), thanks @nicolasbrechet!)
+* use the [tknerr/managed-server-dummy](https://vagrantcloud.com/tknerr/managed-server-dummy) vagrantcloud box ([#22](https://github.com/tknerr/vagrant-managed-servers/pull/22))
+* updated the development environment and sample Vagrantfile for this project to latest Vagrant and plugin versions
+
+## 0.2.0 (released 2014-02-26)
 
 * fix rsync command for Vagrant 1.4 compatibility ([#15](https://github.com/tknerr/vagrant-managed-servers/issues/15))
 * chown synced dirs recursively ([#13](https://github.com/tknerr/vagrant-managed-servers/issues/13))
 * minor README fixes ([#11](https://github.com/tknerr/vagrant-managed-servers/issues/11), [#12](https://github.com/tknerr/vagrant-managed-servers/issues/12), [#16](https://github.com/tknerr/vagrant-managed-servers/issues/16))
 
-# 0.1.0 (released 2013-06-10)
+## 0.1.0 (released 2013-06-10)
 
 * Initial release

data/Gemfile

@@ -6,13 +6,13 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem "vagrant", "1.4.3",
-    :git => "https://github.com/mitchellh/vagrant.git",
-    :ref => "v1.4.3"
-  gem "vagrant-berkshelf", "1.4.0.dev1",
-    :git => "https://github.com/berkshelf/vagrant-berkshelf.git",
-    :ref => "28941db7c2f7d769b979c1d2695ac19b172a6542"
-  gem "vagrant-omnibus", "1.3.0",
-    :git => "https://github.com/schisamo/vagrant-omnibus.git",
-    :ref => "4c91e0f85acdaa88de5e21c5f3f61471a28455d2"
+  gem "vagrant", "1.6.3",
+    git: "https://github.com/mitchellh/vagrant.git",
+    ref: "v1.6.3"
 end
+
+group :plugins do
+  gem "vagrant-managed-servers", path: "."
+  gem "vagrant-omnibus", "1.4.1"
+  gem "vagrant-berkshelf", "3.0.1"
+end

data/README.md

@@ -21,56 +21,78 @@ Credits: this provider was initially based on the [vagrant-aws](https://github.c
 
 ## Usage
 
-Install using standard Vagrant 1.1+ plugin installation methods. After installing, `vagrant up` and specify the `managed` provider. An example is shown below.
-
+Install using the standard Vagrant plugin installation method:
 ```
 $ vagrant plugin install vagrant-managed-servers
-...
-$ vagrant up --provider=managed
-$ vagrant provision
-...
-```
-
-Of course prior to doing this, you'll need to obtain an managed server-compatible box file for Vagrant. Simply use the managed server dummy box for this purpose (see below).
-
-## Quick Start
-
-After installing the plugin (instructions above), the quickest way to get started is to actually use a managed server dummy box and specify the IP address / hostname of the managed server within a `config.vm.provider` block. So first, add the dummy box using any name you want:
-
-```
-$ vagrant box add dummy https://github.com/tknerr/vagrant-managed-servers/raw/master/dummy.box --provider=managed
-...
 ```
 
-And then make a Vagrantfile that looks like the following, filling in your information where necessary.
-
-```
+In the Vagrantfile you can now use the `managed` provider and specify the managed server's hostname and credentials:
+```ruby
 Vagrant.configure("2") do |config|
-  config.vm.box = "dummy"
+  config.vm.box = "tknerr/managed-server-dummy"
 
   config.vm.provider :managed do |managed, override|
-    managed.server = "ip-or-hostname"
-    override.ssh.username = "ubuntu"
-    override.ssh.private_key_path = "PATH TO YOUR PRIVATE KEY"
+    managed.server = "foo.acme.com"
+    override.ssh.username = "bob"
+    override.ssh.private_key_path = "/path/to/bobs_private_key"
   end
 end
 ```
 
-Then run `vagrant up --provider=managed` to "link" vagrant with the managed server. 
+Next run `vagrant up --provider=managed` in order to "link" the vagrant VM with the managed server: 
+```
+$ vagrant up --provider=managed
+Bringing machine 'default' up with 'managed' provider...
+==> default: Box 'tknerr/managed-server-dummy' could not be found. Attempting to find and install...
+    default: Box Provider: managed
+    default: Box Version: >= 0
+==> default: Loading metadata for box 'tknerr/managed-server-dummy'
+    default: URL: https://vagrantcloud.com/tknerr/managed-server-dummy
+==> default: Adding box 'tknerr/managed-server-dummy' (v1.0.0) for provider: managed
+    default: Downloading: https://vagrantcloud.com/tknerr/managed-server-dummy/version/1/provider/managed.box
+    default: Progress: 100% (Rate: 122k/s, Estimated time remaining: --:--:--)
+==> default: Successfully added box 'tknerr/managed-server-dummy' (v1.0.0) for 'managed'!
+==> default: Linking vagrant with managed server foo.acme.com
+==> default:  -- Server: foo.acme.com
+```
 
-Once linked, you can run `vagrant ssh` to ssh into the managed server or `vagrant provision` to provision that server with any of the available vagrant provisioners. 
+Once linked, you can run `vagrant ssh` to ssh into the managed server or `vagrant provision` to provision that server with any of the available vagrant provisioners:
+```
+$ vagrant provision
+...
+$ vagrant ssh
+...
+``` 
 
-If you are done, you can "unlink" vagrant from the managed server by running `vagrant destroy`.
+If you are done, you can "unlink" vagrant from the managed server by running `vagrant destroy`:
+```
+$ vagrant destroy -f
+==> default: Unlinking vagrant from managed server foo.acme.com
+==> default:  -- Server: foo.acme.com
+```
 
 If you try any of the other VM lifecycle commands like `halt`, `resume`, `reload`, etc... you will get a warning that these commands are not supported with the vagrant-managed-servers provider. 
 
 ## Box Format
 
-Every provider in Vagrant must introduce a custom box format. 
+Every provider in Vagrant must introduce a custom box format. This provider introduces a "dummy box" for the `managed` provider which is really nothing more than the required `metadata.json` with the provider name set to "managed". 
 
-This provider introduces `managed` box which is really nothing more than the required `metadata.json` with the provider name set to "managed".
+For Vagrant 1.5+ you can use the [tknerr/managed-server-dummy](https://vagrantcloud.com/tknerr/managed-server-dummy) vagrantcloud box:
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.box = "tknerr/managed-server-dummy"
+  ...
+end
+```
 
-Typically you will not need to change this and can always use the [dummy.box](https://github.com/tknerr/vagrant-managed-servers/raw/master/dummy.box)
+For Vagrant < 1.5 you can point to the [dummy.box](https://github.com/tknerr/vagrant-managed-servers/raw/master/dummy.box) URL directly:
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.box = "managed-server-dummy"
+  config.vm.box_url = "https://github.com/tknerr/vagrant-managed-servers/raw/master/dummy.box"
+  ...
+end
+```
 
 ## Configuration
 

data/Vagrantfile

@@ -1,24 +1,14 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-# require plugin for testing via bundler
-Vagrant.require_plugin "vagrant-managed-servers"
-Vagrant.require_plugin "vagrant-omnibus"
-Vagrant.require_plugin "vagrant-berkshelf"
-
 Vagrant.configure("2") do |config|
 
-  config.omnibus.chef_version = "11.10.4"
-  config.berkshelf.enabled = true
-
   #
   # fake a managed server by bringing up a virtualbox vm
   #
   config.vm.define :fake_managed_server do |fms_config|
-    fms_config.vm.box = "opscode_ubuntu-13.04_provisionerless"
-    fms_config.vm.box_url = "https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-13.04_provisionerless.box"
-  
-    fms_config.vm.network :private_network, ip: "33.33.77.35"
+    fms_config.vm.box = "chef/ubuntu-12.04-i386"
+    fms_config.vm.network :private_network, ip: "192.168.40.35"
   end
 
   #
@@ -26,11 +16,13 @@ Vagrant.configure("2") do |config|
   #
   config.vm.define :my_server do |ms_config|
 
-    ms_config.vm.box = "dummy"
-    ms_config.vm.box_url = "https://github.com/tknerr/vagrant-managed-servers/raw/master/dummy.box"
+    ms_config.vm.box = "tknerr/managed-server-dummy"
+
+    ms_config.omnibus.chef_version = "11.14.6"
+    ms_config.berkshelf.enabled = true
   
     ms_config.vm.provider :managed do |managed_config, override|
-      managed_config.server = "33.33.77.35"
+      managed_config.server = "192.168.40.35"
       override.ssh.username = "vagrant"
       override.ssh.private_key_path = "#{ENV['HOME']}/.vagrant.d/insecure_private_key"
     end

data/lib/vagrant-managed-servers/action.rb

@@ -11,7 +11,11 @@ module VagrantPlugins
       # This action is called to establish linkage between vagrant and the managed server
       def self.action_up
         Vagrant::Action::Builder.new.tap do |b|
-          b.use HandleBoxUrl
+          if Vagrant::VERSION < '1.5.0'
+            b.use HandleBoxUrl
+          else
+            b.use HandleBox
+          end
           b.use ConfigValidate
           b.use WarnNetworks
           b.use LinkServer

data/lib/vagrant-managed-servers/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ManagedServers
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-managed-servers
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Torben Knerr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -112,29 +103,25 @@ files:
 - .travis.yml
 homepage: https://github.com/tknerr/vagrant-managed-servers
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 532192833
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: vagrant-managed-servers
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Enables Vagrant to ssh into and provision managed servers.
 test_files: []