vagrant-parallels 0.1.3 → 0.2.0

data/README.md

@@ -1,6 +1,6 @@
 # Vagrant Parallels Provider
-[![Build Status](https://travis-ci.org/yshahin/vagrant-parallels.png?branch=master)](https://travis-ci.org/yshahin/vagrant-parallels)
-[![Code Climate](https://codeclimate.com/github/yshahin/vagrant-parallels.png)](https://codeclimate.com/github/yshahin/vagrant-parallels)
+[![Build Status](https://travis-ci.org/Parallels/vagrant-parallels.png?branch=master)](https://travis-ci.org/Parallels/vagrant-parallels)
+[![Code Climate](https://codeclimate.com/github/Parallels/vagrant-parallels.png)](https://codeclimate.com/github/Parallels/vagrant-parallels)
 
 This is a [Vagrant](http://www.vagrantup.com) 1.3+ plugin that adds a [Parallels Desktop](http://www.parallels.com/products/desktop/)
 provider to Vagrant, allowing Vagrant to control and provision machines using Parallels Desktop instead of the default Virtualbox.
@@ -59,9 +59,10 @@ That directory also contains instructions on how to build a box.
 Download the box file, then use vagrant to add the downloaded box using this command. Remember to use `bundle exec` before `vagrant` command if you are in development mode
 
 ```
-$ wget https://s3-eu-west-1.amazonaws.com/vagrant-parallels/devbox.box
+$ wget https://s3-eu-west-1.amazonaws.com/vagrant-parallels/devbox-201312.box
 $ vagrant box add devbox devbox.box --provider=parallels
 ```
+***updated box file to fix mac address regeneration issue #42, devbox is Ubuntu 12.04.3 LTS (GNU/Linux 3.2.0-57-generic x86_64***
 
 The box format is basically just the required `metadata.json` file
 along with a `Vagrantfile` that does default settings for the
@@ -129,7 +130,7 @@ Provider allows to define directives for `prlctl set` through `Vagrantfile` in s
 To work on the `vagrant-parallels` plugin, clone this repository out
 
 ```
-$ git clone https://github.com/yshahin/vagrant-parallels
+$ git clone https://github.com/Parallels/vagrant-parallels
 $ cd vagrant-parallels
 ```
 
@@ -166,7 +167,7 @@ After testing you can also build a gem-package by yourself and then install it a
 (if you have 'vagrant-parallels' plugin already installed, delete it first)
 
 ```
-$ git clone https://github.com/yshahin/vagrant-parallels
+$ git clone https://github.com/Parallels/vagrant-parallels
 $ cd vagrant-parallels
 $ rake build
 ...

data/Rakefile

@@ -4,6 +4,9 @@ require 'rubygems'
 require 'bundler/setup'
 require 'rspec/core/rake_task'
 
+#Load i18-tasks
+load 'tasks/i18n-tasks.rake'
+
 # Immediately sync all stdout so that tools like buildbot can
 # immediately load in the output.
 $stdout.sync = true

data/config/i18n-tasks.yml.erb

@@ -0,0 +1,13 @@
+search:
+  paths:
+    - "lib/"
+data:
+  adapter: yaml
+  read:
+    - "locales/%{locale}.yml"
+    - "<%= %x[bundle show vagrant].chomp %>/templates/locales/%{locale}.yml"
+  write:
+    - "locales/%{locale}.yml"
+ignore_unused:
+  - "vagrant_parallels.errors.*"
+  - "vagrant.*"

data/lib/vagrant-parallels/action/import.rb

@@ -11,7 +11,7 @@ module VagrantPlugins
 
         #TODO: Clean up registered VM on interupt
         def call(env)
-          env[:ui].info I18n.t("vagrant_parallels.actions.vm.import.importing",
+          env[:ui].info I18n.t("vagrant.actions.vm.import.importing",
                                :name => env[:machine].box.name)
 
           vm_name = generate_name(env[:root_path])

data/lib/vagrant-parallels/action/{is_saved.rb → is_suspended.rb}

@@ -1,7 +1,7 @@
 module VagrantPlugins
   module Parallels
     module Action
-      class IsSaved
+      class IsSuspended
         def initialize(app, env)
           @app = app
         end

data/lib/vagrant-parallels/action/message_already_running.rb

@@ -7,7 +7,7 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:ui].info I18n.t("vagrant.commands.common.vm_already_running")
+          env[:ui].info I18n.t("vagrant_parallels.commands.common.vm_already_running")
           @app.call(env)
         end
       end

data/lib/vagrant-parallels/action/resume.rb

@@ -10,11 +10,8 @@ module VagrantPlugins
           current_state = env[:machine].provider.state.id
 
           if current_state == :suspended
-            env[:ui].info I18n.t("vagrant.actions.vm.resume.unpausing")
-            env[:machine].provider.driver.resume
-          elsif current_state == :stopped
             env[:ui].info I18n.t("vagrant.actions.vm.resume.resuming")
-            env[:action_runner].run(Boot, env)
+            env[:machine].provider.driver.resume
           end
 
           @app.call(env)

data/lib/vagrant-parallels/action.rb

@@ -73,7 +73,7 @@ module VagrantPlugins
             if env[:result]
               b2.use CheckAccessible
 
-              b2.use Call, IsPaused do |env2, b3|
+              b2.use Call, IsSuspended do |env2, b3|
                 next if !env2[:result]
                 b3.use Resume
               end
@@ -208,23 +208,16 @@ module VagrantPlugins
               next
             end
 
-            b2.use Call, IsSaved do |env2, b3|
+            b2.use Call, IsSuspended do |env2, b3|
               if env2[:result]
-                # The VM is saved, so just resume it
+                # The VM is suspended, so just resume it
                 b3.use action_resume
                 next
               end
 
-              b3.use Call, IsPaused do |env3, b4|
-                if env3[:result]
-                  b4.use Resume
-                  next
-                end
-
-                # The VM is not saved, so we must have to boot it up
-                # like normal. Boot!
-                b4.use action_boot
-              end
+              # The VM is not saved, so we must have to boot it up
+              # like normal. Boot!
+              b3.use action_boot
             end
           end
         end
@@ -283,9 +276,8 @@ module VagrantPlugins
       autoload :Export, File.expand_path("../action/export", __FILE__)
       autoload :ForcedHalt, File.expand_path("../action/forced_halt", __FILE__)
       autoload :Import, File.expand_path("../action/import", __FILE__)
-      autoload :IsPaused, File.expand_path("../action/is_paused", __FILE__)
+      autoload :IsSuspended, File.expand_path("../action/is_suspended", __FILE__)
       autoload :IsRunning, File.expand_path("../action/is_running", __FILE__)
-      autoload :IsSaved, File.expand_path("../action/is_saved", __FILE__)
       autoload :MatchMACAddress, File.expand_path("../action/match_mac_address", __FILE__)
       autoload :MessageAlreadyRunning, File.expand_path("../action/message_already_running", __FILE__)
       autoload :MessageNotCreated, File.expand_path("../action/message_not_created", __FILE__)

data/lib/vagrant-parallels/config.rb

@@ -38,10 +38,9 @@ module VagrantPlugins
         valid_events = ["pre-import", "pre-boot", "post-boot"]
         @customizations.each do |event, _|
           if !valid_events.include?(event)
-            errors << I18n.t(
-              "vagrant_parallels.config.invalid_event",
-              event: event.to_s,
-              valid_events: valid_events.join(", "))
+            errors << I18n.t("vagrant_parallels.config.invalid_event",
+                             event: event.to_s,
+                             valid_events: valid_events.join(", "))
           end
         end
         @customizations.each do |event, command|

data/lib/vagrant-parallels/plugin.rb

@@ -14,7 +14,7 @@ module VagrantPlugins
   module Parallels
 
     class Plugin < Vagrant.plugin("2")
-      name "Parallels"
+      name "vagrant-parallels"
       description <<-EOF
       The Parallels provider allows Vagrant to manage and control
       Parallels-based virtual machines.

data/lib/vagrant-parallels/provider.rb

@@ -48,7 +48,7 @@ module VagrantPlugins
 
         # Translate into short/long descriptions
         short = state_id.to_s.gsub("_", " ")
-        long  = I18n.t("vagrant.commands.status.#{state_id}")
+        long  = I18n.t("vagrant_parallels.commands.status.#{state_id}")
 
         # Return the state
         Vagrant::MachineState.new(state_id, short, long)

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = "0.1.3"
+    VERSION = "0.2.0"
   end
 end