vagrant-vmware-appcatalyst 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ac73e1198470d2c1f15669ed6feefdc74bfb4d3
-  data.tar.gz: 4857c6474445f588daf719aa8c9e5f09dead9c27
+  metadata.gz: d512e327deda40be3cc09299e5a5ceab80e01eb3
+  data.tar.gz: 6555b7d9a7239d1122c2b3dd4719d2e654f0e1a7
 SHA512:
-  metadata.gz: 6e2ec3c215846e860da01bc631dc144cd84ebcd33d34f53c92a5c4b1dee298b5dc446925116ca7d1c30163e7e36bbac6ecaf6417e8d289e5adfeff63075af839
-  data.tar.gz: 6e210113312d745143ede56ec30b5b2c843d2984c0b56afb2e8cc08cd0367c270189131abe3ea1d43db4d773c5b7d7c4d63d7d3576b6b21a08c279885b8e673e
+  metadata.gz: bffc37b6d4762f27be2af8425a2fc3f6b7d4d8af32960191755dcef9f040feae080cfc755e7afb97b7b92401fea09a7a448de8d6cb96c447e4eb2abe4c9d0a54
+  data.tar.gz: fe1e0026fb359954ec6495248347fbc2789a04765273a98b5886073da7cd8e6beab0f5c365b0a1cea0e22822650e76483458c907cb931055dcf402a2c4176596

data/Gemfile

@@ -1,7 +1,11 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec
 
+group :plugins do
+  gem 'vagrant-vmware-appcatalyst' , path: '.'
+end
+
 group :development do
-  gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git'
+  gem 'vagrant', :git => 'https://github.com/mitchellh/vagrant.git'
 end

data/README.md

@@ -14,6 +14,9 @@ Vagrant will download all the required gems during the installation process.
 
 After the install has completed a ```vagrant up --provider=vmware_appcatalyst``` will trigger the newly installed provider.
 
+*Note: The AppCatalyst Daemon must be running before bringing up a new vagrant box:*
+```appcatalyst-daemon start```
+
 Upgrade
 -------------
 

data/Rakefile

@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'rspec/core/rake_task'
+
+Bundler::GemHelper.install_tasks
+# RSpec::Core::RakeTask.new
+# task :default => "spec"

data/lib/vagrant-vmware-appcatalyst/action.rb

@@ -79,13 +79,17 @@ module VagrantPlugins
 
       def self.action_suspend
         Vagrant::Action::Builder.new.tap do |b|
-          b.use MessageNotSupported
+          b.use ConfigValidate
+          b.use ConnectAppCatalyst
+          b.use Suspend
         end
       end
 
       def self.action_resume
         Vagrant::Action::Builder.new.tap do |b|
-          b.use MessageNotSupported
+          b.use ConfigValidate
+          b.use ConnectAppCatalyst
+          b.use Resume
         end
       end
 
@@ -226,6 +230,10 @@ module VagrantPlugins
                action_root.join('is_created')
       autoload :IsRunning,
                action_root.join('is_running')
+      autoload :Suspend,
+               action_root.join('suspend')
+      autoload :Resume,
+               action_root.join('resume')
       autoload :MessageAlreadyRunning,
                action_root.join('message_already_running')
       autoload :MessageNotRunning,

data/lib/vagrant-vmware-appcatalyst/action/read_state.rb

@@ -44,8 +44,8 @@ module VagrantPlugins
             @logger.info("VM [#{vm_name}] is running")
             return :running
           when 'powering off'
-            @logger.info("VM [#{vm_name}] is stopped")
-            return :stopped
+            @logger.info("VM [#{vm_name}] is stopping")
+            return :stopping
           when 'powered off'
             @logger.info("VM [#{vm_name}] is stopped")
             return :stopped
@@ -54,13 +54,13 @@ module VagrantPlugins
             return :suspended
           when 'suspending'
             @logger.info("VM [#{vm_name}] is suspended")
-            return :suspended
+            return :suspending
           when 'tools_running'
             @logger.info("VM [#{vm_name}] is running")
             return :running
           when 'blocked on msg'
             @logger.info("VM [#{vm_name}] is stopped")
-            return :stopped
+            return :blocked
           else
             @logger.info("VM [#{vm_name}] is in an unknown state")
             return :unknown

data/lib/vagrant-vmware-appcatalyst/action/resume.rb

@@ -21,8 +21,15 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:appcatalyst_cnx].set_vm_power(env[:machine].id, 'resume')
+          current_state = env[:machine].state.id
 
+          if current_state == :paused
+            env[:ui].info I18n.t('vagrant.actions.vm.resume.unpausing')
+            env[:appcatalyst_cnx].set_vm_power(env[:machine].id, 'unpause')
+          elsif current_state == :suspended
+            env[:ui].info I18n.t('vagrant.actions.vm.resume.resuming')
+            env[:appcatalyst_cnx].set_vm_power(env[:machine].id, 'on')
+          end
           @app.call(env)
         end
       end

data/lib/vagrant-vmware-appcatalyst/action/suspend.rb

@@ -21,7 +21,10 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:appcatalyst_cnx].set_vm_power(env[:machine].id, 'suspend')
+          if env[:machine].state.id == :running
+            env[:ui].info I18n.t('vagrant.actions.vm.suspend.suspending')
+            env[:appcatalyst_cnx].set_vm_power(env[:machine].id, 'suspend')
+          end
 
           @app.call(env)
         end

data/lib/vagrant-vmware-appcatalyst/cap/mount_appcatalyst_shared_folder.rb

@@ -34,7 +34,14 @@ module VagrantPlugins
             mount_gid_old = "`id -g #{options[:group]}`"
           end
 
-          # First mount command uses getent to get the group
+          # First mount command uses vmhgfs FUSE which is the preferred mount
+          # style.
+          mount_options = "-o allow_other,uid=#{mount_uid},gid=#{mount_gid}"
+          mount_options += ",#{options[:mount_options].join(",")}" if options[:mount_options]
+          mount_commands << "/usr/bin/vmhgfs-fuse #{mount_options} .host:/#{name} #{expanded_guest_path}"
+
+          # second mount command fallsback to the kernel vmhgfs module and uses
+          # getent to get the group.
           mount_options = "-o uid=#{mount_uid},gid=#{mount_gid}"
           mount_options += ",#{options[:mount_options].join(",")}" if options[:mount_options]
           mount_commands << "mount -t vmhgfs #{mount_options} .host:/#{name} #{expanded_guest_path}"
@@ -47,6 +54,9 @@ module VagrantPlugins
           # Create the guest path if it doesn't exist
           machine.communicate.sudo("mkdir -p #{expanded_guest_path}")
 
+          # Get rid of the default /mnt/hgfs mount point
+          machine.communicate.sudo('umount /mnt/hgfs')
+
           # Attempt to mount the folder. We retry here a few times because
           # it can fail early on.
           attempts = 0

data/lib/vagrant-vmware-appcatalyst/provider.rb

@@ -40,7 +40,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_appcatalyst.commands.status.#{state_id}")
 
         # If we're not created, then specify the special ID flag
         if state_id == :not_created

data/lib/vagrant-vmware-appcatalyst/version.rb

@@ -13,6 +13,6 @@
 
 module VagrantPlugins
   module AppCatalyst
-    VERSION = '1.0.3'
+    VERSION = '1.1.0'
   end
 end

data/locales/en.yml

@@ -11,6 +11,43 @@
 # the License.
 en:
   vagrant_appcatalyst:
+    commands:
+      status:
+        stopped: |-
+          The VM is powered off. To restart the VM, simply run `vagrant up`
+        stopping: |-
+          The VM is stopping.
+        not_created: |-
+          The environment has not yet been created. Run `vagrant up` to
+          create the environment. If a machine is not created, only the
+          default provider will be shown. So if a provider is not listed,
+          then the machine is not created for that environment.
+        running: |-
+          The VM is running. To stop this VM, you can run `vagrant halt` to
+          shut it down forcefully, or you can run `vagrant suspend` to simply
+          suspend the virtual machine. In either case, to restart it again,
+          simply run `vagrant up`.
+        suspending: |-
+          The VM is currently saving its state. In a few moments this state
+          should transition to "suspended." Please run `vagrant status` again
+          in a few seconds.
+        suspended: |-
+          To resume this VM, simply run `vagrant resume` or `vagrant up`.
+        output: |-
+          Current machine states:
+
+          %{states}
+
+          %{message}
+        blocked: |-
+          The VM is "blocked" This is a very rare state which means that
+          AppCatalyst is unable to start the VM as the VMX requires manual
+          intervention. The only known solution to this problem is to destroy
+          your machine, sorry.
+        listing: |-
+          This environment represents multiple VMs. The VMs are all listed
+          above with their current state. For more information about a specific
+          VM, run `vagrant status NAME`.
     vm:
       cloning: |-
         Cloning VM, this might take a while...

data/vagrant-vmware-appcatalyst.gemspec

@@ -33,6 +33,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec-expectations', '~> 2.14'
   s.add_development_dependency 'rspec-mocks', '~> 2.14'
 
+  s.add_development_dependency 'bundler', '~> 1.3'
+  s.add_development_dependency 'rake'
+
   s.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files = s.files.grep(%r{^(test|spec|features)/})

metadata

@@ -1,99 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vmware-appcatalyst
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Fabio Rapposelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Enables Vagrant to manage machines with VMware AppCatalyst®.
 email:
 - fabio@vmware.com
@@ -101,11 +129,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
+- ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - LICENSE
 - README.md
+- Rakefile
 - lib/vagrant-vmware-appcatalyst.rb
 - lib/vagrant-vmware-appcatalyst/action.rb
 - lib/vagrant-vmware-appcatalyst/action/connect_appcatalyst.rb
@@ -148,17 +177,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: VMware AppCatalyst® provider