vagrant-sakura 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa036bfb2f34ad5a5927efc3a83b28322ddd64b3
-  data.tar.gz: e40636b2131472717a7a84fa2e588a120354160c
+  metadata.gz: ed22d90e7ac0a847a3df3114dfb4d3c72f09ed03
+  data.tar.gz: c515ec435d3c2bfec4d73e6c2fb2a9fa49d5405b
 SHA512:
-  metadata.gz: bfe40bc2ccd583e3806d1e98d12e04904f0997c0a921a9a32e37fa599dbdc4099a216d24b334071a4508c5e3d7889108e853370dd7b7854be72713f8f67294c5
-  data.tar.gz: 9271eaaafdbc25c4b60587985f43d709498048de14c20b80f0820054d12434ae919c79cef9b5f6ebab700290c5a73b57d03afcfd3ff1fb03bc6485435bb073b7
+  metadata.gz: d06e0b32afab6b86ae38cbe7a4d85284968a7d03c565de5778eabb7e10d5352446fabf6496905c05032a87caac374a7ab90ea37f2e9033bd4a12e0758cc9fa5f
+  data.tar.gz: 7ea023edc7e7aa70a994e2c9cccd55dfe3855ec40b687b424b2abf0899d904955ec90f37de2167f74a9c84239dd222abb1a9ab3ae33161d99abe3d8aaa85d57f

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.0.3 (2013/10/22)
+
+- Support `provision` command.
+
 # 0.0.2 (2013/10/08)
 
 - Add `vagrant sakura-list-id` command.

data/LICENSE-vagrant-aws.txt

@@ -0,0 +1,8 @@
+The MIT License (MIT)
+Copyright (c) 2013 Mitchell Hashimoto
+
+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/lib/vagrant-sakura/action.rb

@@ -43,20 +43,23 @@ module VagrantPlugins
         end
       end
 
-#      def self.action_provision
-#        Vagrant::Action::Builder.new.tap do |b|
-#          b.use ConfigValidate
-#          b.use Call, IsCreated do |env, b2|
-#            if !env[:result]
-#              b2.use MessageNotCreated
-#              next
-#            end
-#
-#            b2.use Provision
-#            b2.use SyncFolders
-#          end
-#        end
-#      end
+      def self.action_provision
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectSakura
+          b.use Call, ReadState do |env, b2|
+            case env[:machine_state_id]
+            when :up
+              b2.use Provision
+              b2.use SyncFolders
+            when :down, :cleaning
+              b2.use MessageDown
+            when :not_created
+              b2.use MessageNotCreated
+            end
+          end
+        end
+      end
 
       def self.action_read_ssh_info
         Vagrant::Action::Builder.new.tap do |b|
@@ -82,7 +85,7 @@ module VagrantPlugins
             case env[:machine_state_id]
             when :up
               b2.use Reset
-              b2.use Provision
+              b2.use action_provision
             when :down, :cleaning
               b2.use MessageDown
             when :not_created
@@ -140,7 +143,7 @@ module VagrantPlugins
               b2.use Provision
             when :not_created
               b2.use RunInstance
-              b2.use Provision
+              b2.use action_provision
             end
           end
         end
@@ -161,7 +164,7 @@ module VagrantPlugins
       autoload :ReadState, action_root.join("read_state")
       autoload :Reset, action_root.join("reset")
       autoload :RunInstance, action_root.join("run_instance")
-      #autoload :SyncFolders, action_root.join("sync_folders")
+      autoload :SyncFolders, action_root.join("sync_folders")
     end
   end
 end

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

@@ -0,0 +1,96 @@
+require "log4r"
+
+require "vagrant/util/subprocess"
+
+require "vagrant/util/scoped_hash_override"
+
+require "vagrant/util/which"
+
+module VagrantPlugins
+  module Sakura
+    module Action
+      # This middleware uses `rsync` to sync the folders over to the
+      # Sakura Cloud instance.
+      class SyncFolders
+        include Vagrant::Util::ScopedHashOverride
+
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_sakura::action::sync_folders")
+        end
+
+        def call(env)
+          @app.call(env)
+
+          ssh_info = env[:machine].ssh_info
+
+          env[:machine].config.vm.synced_folders.each do |id, data|
+            data = scoped_hash_override(data, :sakura)
+
+            # Ignore disabled shared folders
+            next if data[:disabled]
+
+            unless Vagrant::Util::Which.which('rsync')
+              env[:ui].warn(I18n.t('vagrant_sakura.rsync_not_found_warning'))
+              break
+            end
+
+            hostpath  = File.expand_path(data[:hostpath], env[:root_path])
+            guestpath = data[:guestpath]
+
+            # Make sure there is a trailing slash on the host path to
+            # avoid creating an additional directory with rsync
+            hostpath = "#{hostpath}/" if hostpath !~ /\/$/
+
+            # on windows rsync.exe requires cygdrive-style paths
+            if Vagrant::Util::Platform.windows?
+              hostpath = hostpath.gsub(/^(\w):/) { "/cygdrive/#{$1}" }
+            end
+
+            env[:ui].info(I18n.t("vagrant_sakura.rsync_folder",
+                                :hostpath => hostpath,
+                                :guestpath => guestpath))
+
+            # Create the host path if it doesn't exist and option flag is set
+            if data[:create]
+              begin
+                FileUtils::mkdir_p(hostpath)
+              rescue => err
+                raise Errors::MkdirError,
+                  :hostpath => hostpath,
+                  :err => err
+              end
+            end
+
+            # Create the guest path
+            env[:machine].communicate.sudo("mkdir -p '#{guestpath}'")
+            env[:machine].communicate.sudo(
+              "chown #{ssh_info[:username]} '#{guestpath}'")
+
+            # Rsync over to the guest path using the SSH info
+            command = [
+              "rsync", "--verbose", "--archive", "-z",
+              "--exclude", ".vagrant/", "--exclude", "Vagrantfile",
+              "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{ssh_info[:private_key_path]}'",
+              hostpath,
+              "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
+
+            # we need to fix permissions when using rsync.exe on windows, see
+            # http://stackoverflow.com/questions/5798807/rsync-permission-denied-created-directories-have-no-permissions
+            if Vagrant::Util::Platform.windows?
+              command.insert(1, "--chmod", "ugo=rwX")
+            end
+
+            r = Vagrant::Util::Subprocess.execute(*command)
+            if r.exit_code != 0
+              raise Errors::RsyncError,
+                :guestpath => guestpath,
+                :hostpath => hostpath,
+                :stderr => r.stderr
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-sakura/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Sakura
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/locales/en.yml

@@ -16,6 +16,11 @@ en:
       Server is booted and ready for use!
     reset: |-
       The server was reloaded.
+    rsync_folder: |-
+      Rsyncing folder: %{hostpath} => %{guestpath}
+    rsync_not_found_warning: |-
+      Warning! Folder sync disabled because the rsync binary is missing.
+      Make sure rsync is installed and the binary can be found in the PATH.
     state_cleaning: |-
       The server is terminated and cleaning up.
     state_down: |-

data/vagrant-sakura.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["sahara@surt.net"]
   spec.description   = %q{Enables Vagrant to manage machines in Sakura Cloud.}
   spec.summary       = %q{Enables Vagrant to manage machines in Sakura Cloud.}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/tsahara/vagrant-sakura"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-sakura
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Tomoyuki Sahara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -48,6 +48,7 @@ files:
 - .gitignore
 - CHANGELOG.md
 - Gemfile
+- LICENSE-vagrant-aws.txt
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -70,6 +71,7 @@ files:
 - lib/vagrant-sakura/action/read_state.rb
 - lib/vagrant-sakura/action/reset.rb
 - lib/vagrant-sakura/action/run_instance.rb
+- lib/vagrant-sakura/action/sync_folders.rb
 - lib/vagrant-sakura/command.rb
 - lib/vagrant-sakura/config.rb
 - lib/vagrant-sakura/driver/api.rb
@@ -80,7 +82,7 @@ files:
 - lib/vagrant-sakura/version.rb
 - locales/en.yml
 - vagrant-sakura.gemspec
-homepage: ''
+homepage: https://github.com/tsahara/vagrant-sakura
 licenses:
 - MIT
 metadata: {}