vagrant-rackspace 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fe21c6407d830b5385525127b4a603868d1633e
-  data.tar.gz: 844c3ce48da303288e07f98908f139d15883c98b
+  metadata.gz: 7324f904ffa180128b4c16db1c61a2ca9aa86ba8
+  data.tar.gz: 83d9122d95c830e14093e988fbc72329aa14e6a2
 SHA512:
-  metadata.gz: 01154897155ab913685c7521b06dd44019e35cb0437ab267089e611ef36376dab5fccb94c96bcc61b5c498e1c3d990228f51913fdaed13f7bba8c738122db9c3
-  data.tar.gz: 094f97a4d92ade0439411eb3d8e944f1401c2fee5925dc355066e9b71807cfda563e41df2b8ee10be058a126ffe453665d094019951260b03a12a29cc2f17620
+  metadata.gz: d6e0ffe9c336faa5cb93752b42a2d73aabc67ff8f728128eac860d0e1100090fc53a9c0219aa9f8ef1986103b1473155f96a9c8fb2fafb96aa5e18f3ca128999
+  data.tar.gz: 2420f4a7ff9decf897cecd34501ec39e713d84731f342ac464552ad5dd9888c5f14c7b8822ee6b3ea63f637b15def31fe72bf5e43dddcb056de68041d6f97bee

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+# 0.1.8 (June 20, 2014)
+
+FEATURES:
+
+ 
+
+IMPROVEMENTS:
+
+ - Copy symlinks when syncing folders using older versions of vagrant [GH-89]
+ - Update vagrant to allow users to specify non-standard images and flavors [GH-101]
+
+BUG FIXES:
+
+  - Fixed windows path issue when syncing folders older versions of vagrant [GH-96]
+
+
 # 0.1.7 (March 13, 2014)
 
 FEATURES:

data/Gemfile

@@ -1,9 +1,12 @@
 source 'https://rubygems.org'
 
-gemspec
+
+group :plugins do
+  gemspec
+  gem 'vagrant', :git => 'https://github.com/mitchellh/vagrant'
+end
 
 gem "appraisal", "1.0.0.beta2"
-gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.4.3"
 
 group :development do
   # We depend on Vagrant for development, but we don't add it as a
@@ -13,3 +16,4 @@ group :development do
   gem 'pry'
 end
 
+  

data/README.md

@@ -1,8 +1,8 @@
-# Vagrant RackSpace Cloud Provider
+# Vagrant Rackspace Cloud Provider
 
 This is a [Vagrant](http://www.vagrantup.com) 1.1+ plugin that adds a
-[RackSpace Cloud](http://www.rackspace.com/cloud) provider to Vagrant,
-allowing Vagrant to control and provision machines within RackSpace
+[Rackspace Cloud](http://www.rackspace.com/cloud) provider to Vagrant,
+allowing Vagrant to control and provision machines within Rackspace
 cloud.
 
 **Note:** This plugin requires Vagrant 1.1+.
@@ -35,7 +35,7 @@ box file for Vagrant.
 The default configuration of the RHEL family of Linux distributions requires a tty in order to run sudo.  Vagrant does not connect with a tty by default, so you may experience the error:
 > sudo: sorry, you must have a tty to run sudo
 
-The best way to take deal with this error is to upgrade to Vagrant 1.4 or later, and enable:
+The best way to deal with this error is to upgrade to Vagrant 1.4 or later, and enable:
 ```ruby
 config.ssh.pty = true
 ```
@@ -79,6 +79,18 @@ Note that normally a lot of this boilerplate is encoded within the box
 file, but the box file used for the quick start, the "dummy" box, has
 no preconfigured defaults.
 
+### Flavors / Images
+
+ To determine what flavors and images are avliable in your region refer to the [Custom Commands](#custom-commands) section.
+
+### RackConnect
+
+If you are using RackConnect with vagrant, you will need to add the following line to the `config.vm.provider` section to prevent timeouts.
+
+  ```
+  rs.rackconnect = true
+  ```
+
 ## Custom Commands
 
 The plugin includes several Rackspace-specific vagrant commands.  You can get the
@@ -154,29 +166,6 @@ Vagrant.configure("2") do |config|
 end
 ```
 
-### Flavors
-
-As of February 2, 2014, the available flavor names are:
-
-* 512MB Standard Instance
-* 1GB Standard Instance
-* 2GB Standard Instance
-* 4GB Standard Instance
-* 8GB Standard Instance
-* 15GB Standard Instance
-* 30GB Standard Instance
-* 1 GB Performance
-* 2 GB Performance
-* 4 GB Performance
-* 8 GB Performance
-* 120 GB Performance
-* 15 GB Performance
-* 30 GB Performance
-* 60 GB Performance
-* 90 GB Performance
-
-Please note that the standard instances are deprecated in favor of our performance flavors.
-
 ## Networks
 
 Networking features in the form of `config.vm.network` are not

data/Vagrantfile

@@ -14,6 +14,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = "dummy"
   config.vm.provider :rackspace do |rs|
     rs.username = ENV['RAX_USERNAME']
+    rs.admin_password = ENV['VAGRANT_ADMIN_PASSWORD']
     rs.api_key  = ENV['RAX_API_KEY']
     rs.flavor   = /1 GB Performance/
     rs.image    = /Ubuntu/

data/lib/vagrant-rackspace/action.rb

@@ -36,7 +36,11 @@ module VagrantPlugins
             end
 
             b2.use Provision
-            b2.use SyncFolders
+            if defined?(SyncedFolders)
+              b2.use SyncedFolders
+            else
+              b2.use SyncFolders
+            end
           end
         end
       end
@@ -102,7 +106,11 @@ module VagrantPlugins
 
             b2.use ConnectRackspace
             b2.use Provision
-            b2.use SyncFolders
+            if defined?(SyncedFolders)
+              b2.use SyncedFolders
+            else
+              b2.use SyncFolders
+            end
             b2.use CreateServer
           end
         end

data/lib/vagrant-rackspace/action/create_server.rb

@@ -21,12 +21,12 @@ module VagrantPlugins
 
           # Find the flavor
           env[:ui].info(I18n.t("vagrant_rackspace.finding_flavor"))
-          flavor = find_matching(env[:rackspace_compute].flavors.all, config.flavor)
+          flavor = find_matching(env[:rackspace_compute].flavors, config.flavor)
           raise Errors::NoMatchingFlavor if !flavor
 
           # Find the image
           env[:ui].info(I18n.t("vagrant_rackspace.finding_image"))
-          image = find_matching(env[:rackspace_compute].images.all, config.image)
+          image = find_matching(env[:rackspace_compute].images, config.image)
           raise Errors::NoMatchingImage if !image
 
           # Figure out the name for the server
@@ -59,8 +59,12 @@ module VagrantPlugins
             :metadata    => config.metadata
           }
 
+          if config.admin_password
+            options[:password] = config.admin_password
+          end
+
           if config.key_name
-            options[:keypair] = config.key_name
+            options[:key_name] = config.key_name
             env[:ui].info(" -- Key Name: #{config.key_name}")
           else
             options[:personality] = [
@@ -141,13 +145,11 @@ module VagrantPlugins
         # `name`. Or, if `name` is a regexp, a partial match is chosen
         # as well.
         def find_matching(collection, name)
-          collection.each do |single|
-            return single if single.id == name
-            return single if single.name == name
-            return single if name.is_a?(Regexp) && name =~ single.name
+          if name.is_a?(Regexp)
+            collection.all.find {|item| name =~ item.name }
+          else
+            collection.get name
           end
-
-          nil
         end
       end
     end

data/lib/vagrant-rackspace/action/sync_folders.rb

@@ -16,6 +16,7 @@ module VagrantPlugins
 
         def call(env)
           @app.call(env)
+          env[:ui].warn(I18n.t("vagrant_rackspace.sync_folders"))
 
           ssh_info = env[:machine].ssh_info
 
@@ -32,7 +33,7 @@ module VagrantPlugins
             
             # If on Windows, modify the path to work with cygwin rsync
             if @host_os =~ /mswin|mingw|cygwin/
-              hostpath = hostpath.sub(/^([A-Za-z]):\//, "/cygdrive/#{$1.downcase}/")
+              hostpath = hostpath.sub(/^([A-Za-z]):\//) { "/cygdrive/#{$1.downcase}/" }
             end
 
             env[:ui].info(I18n.t("vagrant_rackspace.rsync_folder",
@@ -54,7 +55,7 @@ module VagrantPlugins
             # .hg/ to exclude list as that isn't covered in
             # --cvs-exclude
             command = [
-              "rsync", "--verbose", "--archive", "-z",
+              "rsync", "--verbose", "--archive", "-z", "-L",
               "--cvs-exclude", 
               "--exclude", ".hg/",
               *includes,

data/lib/vagrant-rackspace/config.rb

@@ -102,6 +102,13 @@ module VagrantPlugins
       # @return [Array]
       attr_accessor :rsync_includes
 
+      # Password to set for root (on Linux) or Administrator (on Windows)
+      # A random password will be generated if admin_password is not set or
+      # does not meet the password requirements of the operating system.
+      #
+      # @return [String]
+      attr_accessor :admin_password
+
       # Default Rackspace Cloud Network IDs
       SERVICE_NET_ID = '11111111-1111-1111-1111-111111111111'
       PUBLIC_NET_ID = '00000000-0000-0000-0000-000000000000'

data/lib/vagrant-rackspace/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Rackspace
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

data/locales/en.yml

@@ -36,6 +36,9 @@ en:
       Warning! The Rackspace provider doesn't support any of the Vagrant
       high-level network configurations (`config.vm.network`). They
       will be silently ignored.
+    sync_folders: |-
+        Rackspace support for Vagrant 1.3 has been deprecated. Please
+        upgrade to the latest version of vagrant for continued support. 
 
     config:
       api_key_required: |-

data/spec/vagrant-rackspace/config_spec.rb

@@ -24,6 +24,7 @@ describe VagrantPlugins::Rackspace::Config do
     its(:disk_config) { should be_nil }
     its(:networks) { should be_nil }
     its(:rsync_includes) { should be_nil }
+    its(:admin_password)  { should be_nil }
   end
 
   describe "overriding defaults" do
@@ -37,7 +38,8 @@ describe VagrantPlugins::Rackspace::Config do
       :rackconnect,
       :server_name,
       :disk_config,
-      :username].each do |attribute|
+      :username,
+      :admin_password].each do |attribute|
       it "should not default #{attribute} if overridden" do
         subject.send("#{attribute}=".to_sym, "foo")
         subject.finalize!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-rackspace
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Mitchell Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage machines in RackSpace Cloud.