vagrant-tiktalik 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f456716376d5e63c7b37333c0ccc1f639bdd53cf
-  data.tar.gz: 407f7c942914a6f10a74f873381bdf68e924b67b
+  metadata.gz: aa7a2d5f9d74351e8d3e87cc82bf1d01fda2798c
+  data.tar.gz: c1cb2ddd0b3b5b27e7244c4cb9915f1e9a01ae7c
 SHA512:
-  metadata.gz: 1466932aa634bfc17b8f460dd3385988c70b44fe280a4d7b9762471690bfec28425453d0e875ea56964a724cdaa413953869528ce32f64cd8afca41da3bc0db1
-  data.tar.gz: f7219b9d4a3797d94a9f050948bdf3f55e52c9b2bbe21044e36b2e7d9cbba337ad2f8e734673b1dd0e14a2edc281d6ee55ccfd5bdd43987728012176c9db375c
+  metadata.gz: 18bf46b29af874d748ff14dd67b0e63ddbd7ba6b8e7cd3d5f50647f6ecd7d52e0c6e925f386f4a52dbd2a193b342bff4829c45f37a0d1078e0aa0040ce66a990
+  data.tar.gz: 5083b25e15d18c69c9dedb6038e9e2f33078d2320a3ebea59fb0b672e211935da43430102a17590e1da0e0924340142b8716c7be03cf78640fd22d419c7b8c16

data/Gemfile

@@ -1,12 +1,12 @@
 source "https://rubygems.org"
 
-gemspec
-
 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", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.3.2"
+    gem "vagrant",
+          git: "git://github.com/mitchellh/vagrant.git"
+end
+
+group :plugins do
+    gem "vagrant-tiktalik", path: "."
 end
 
 gem "tiktalik", "~> 1.0.3"

data/lib/vagrant-tiktalik/action.rb

@@ -104,7 +104,6 @@ module VagrantPlugins
       # This action is called to bring the box up from nothing.
       def self.action_up
         Vagrant::Action::Builder.new.tap do |b|
-          b.use HandleBoxUrl
           b.use ConfigValidate
 
           b.use Call, ReadState do |env, b2|

data/lib/vagrant-tiktalik/action/read_ssh_info.rb

@@ -41,6 +41,9 @@ module VagrantPlugins
             ip = iface.ip if iface.network.public == true
           end
 
+          # no public interfaces found, give a first private one
+          ip = instance.interfaces[0].ip if ip.nil?
+
           # Read the DNS info
           return {
             :host => ip,

data/lib/vagrant-tiktalik/action/run_instance.rb

@@ -50,8 +50,16 @@ module VagrantPlugins
 
             n = Tiktalik::Computing::Network
             n.all.each do |network|
-              (networks.push network.uuid.to_s) if network.public
-              break if network.public
+              uuid = network.uuid.to_s
+              name = network.name.to_s
+              if @config.networks
+                (networks.push uuid) if
+                  @config.networks.include?(uuid) or
+                  @config.networks.include?(name)
+              else
+                (networks.push uuid) if network.public
+                break if network.public
+              end
             end
 
             env[:ui].info(" -- Networks: #{networks}")

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

@@ -44,11 +44,16 @@ module VagrantPlugins
             env[:machine].communicate.sudo(
               "chown #{ssh_info[:username]} '#{guestpath}'")
 
+            ssh_command = "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{ssh_info[:private_key_path]}'"
+
+            # support config.ssh.proxy_command
+            ssh_command += " -o ProxyCommand='#{env[:machine].config.ssh.proxy_command}'" if env[:machine].config.ssh.proxy_command
+
             # Rsync over to the guest path using the SSH info
             command = [
               "rsync", "--verbose", "--archive", "-z",
               "--exclude", ".vagrant/",
-              "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{ssh_info[:private_key_path]}'",
+              "-e", ssh_command,
               hostpath,
               "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
 

data/lib/vagrant-tiktalik/config.rb

@@ -9,7 +9,7 @@ module VagrantPlugins
       attr_accessor :ssh_key
       attr_accessor :api_secret
       attr_accessor :ca_file
-      #attr_accessor :network
+      attr_accessor :networks
 
       def initialize
         @api_key    = UNSET_VALUE
@@ -18,7 +18,7 @@ module VagrantPlugins
         @ssh_key    = UNSET_VALUE
         @api_secret = UNSET_VALUE
         @ca_file    = UNSET_VALUE
-        #@network    = UNSET_VALUE
+        @networks   = UNSET_VALUE
       end
 
       def finalize!
@@ -28,7 +28,7 @@ module VagrantPlugins
         @ssh_key    = nil if @ssh_key == UNSET_VALUE
         @api_secret = ENV['TIKTALIK_API_SECRET'] if @api_secret == UNSET_VALUE
         @ca_file    = nil if @ca_file == UNSET_VALUE
-        #@network    = nil if @network == UNSET_VALUE
+        @networks   = nil if @networks == UNSET_VALUE
       end
 
       def validate(machine)

data/lib/vagrant-tiktalik/version.rb

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

data/vagrant-tiktalik/.gitignore

@@ -0,0 +1,22 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log

data/vagrant-tiktalik/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in vagrant-tiktalik.gemspec
+gemspec

data/vagrant-tiktalik/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2014 Daniel Wagner
+
+MIT License
+
+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/vagrant-tiktalik/README.md

@@ -0,0 +1,29 @@
+# Vagrant::Tiktalik
+
+TODO: Write a gem description
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'vagrant-tiktalik'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install vagrant-tiktalik
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Contributing
+
+1. Fork it ( https://github.com/[my-github-username]/vagrant-tiktalik/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request

data/vagrant-tiktalik/Rakefile

@@ -0,0 +1,2 @@
+require "bundler/gem_tasks"
+

data/vagrant-tiktalik/lib/vagrant/tiktalik.rb

@@ -0,0 +1,7 @@
+require "vagrant/tiktalik/version"
+
+module Vagrant
+  module Tiktalik
+    # Your code goes here...
+  end
+end

data/vagrant-tiktalik/lib/vagrant/tiktalik/version.rb

@@ -0,0 +1,5 @@
+module Vagrant
+  module Tiktalik
+    VERSION = "0.0.1"
+  end
+end

data/vagrant-tiktalik/vagrant-tiktalik.gemspec

@@ -0,0 +1,23 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'vagrant/tiktalik/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "vagrant-tiktalik"
+  spec.version       = Vagrant::Tiktalik::VERSION
+  spec.authors       = ["Daniel Wagner"]
+  spec.email         = ["daniel.wagner@bwave.pl"]
+  spec.summary       = %q{TODO: Write a short summary. Required.}
+  spec.description   = %q{TODO: Write a longer description. Optional.}
+  spec.homepage      = ""
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "rake"
+end

data/vendor/bundle/ruby/2.0.0/bin/erubis

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'erubis' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'erubis', version
+load Gem.bin_path('erubis', 'erubis', version)

data/vendor/bundle/ruby/2.0.0/bin/httpclient

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'httpclient' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'httpclient', version
+load Gem.bin_path('httpclient', 'httpclient', version)

data/vendor/bundle/ruby/2.0.0/bin/listen

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'listen' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'listen', version
+load Gem.bin_path('listen', 'listen', version)

data/vendor/bundle/ruby/2.0.0/bin/nokogiri

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'nokogiri' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'nokogiri', version
+load Gem.bin_path('nokogiri', 'nokogiri', version)

data/vendor/bundle/ruby/2.0.0/bin/rackup

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'rack' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'rack', version
+load Gem.bin_path('rack', 'rackup', version)

data/vendor/bundle/ruby/2.0.0/bin/vagrant

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'vagrant' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'vagrant', version
+load Gem.bin_path('vagrant', 'vagrant', version)

data/vendor/bundle/ruby/2.0.0/build_info/akami-1.2.2.info

@@ -0,0 +1 @@
+

data/vendor/bundle/ruby/2.0.0/build_info/builder-3.2.2.info

@@ -0,0 +1 @@
+

data/vendor/bundle/ruby/2.0.0/build_info/celluloid-0.15.2.info

@@ -0,0 +1 @@
+

data/vendor/bundle/ruby/2.0.0/build_info/childprocess-0.5.3.info

@@ -0,0 +1 @@
+

data/vendor/bundle/ruby/2.0.0/build_info/erubis-2.7.0.info

@@ -0,0 +1 @@
+

data/vendor/bundle/ruby/2.0.0/build_info/faraday-0.8.9.info

@@ -0,0 +1 @@
+

data/vendor/bundle/ruby/2.0.0/build_info/ffi-1.9.3.info

@@ -0,0 +1 @@
+

data/vendor/bundle/ruby/2.0.0/build_info/gssapi-1.0.3.info

@@ -0,0 +1 @@
+

data/vendor/bundle/ruby/2.0.0/build_info/gyoku-1.1.1.info

@@ -0,0 +1 @@
+

data/vendor/bundle/ruby/2.0.0/build_info/httpclient-2.4.0.info

@@ -0,0 +1 @@
+

data/vendor/bundle/ruby/2.0.0/build_info/httpi-0.9.7.info

@@ -0,0 +1 @@
+

data/vendor/bundle/ruby/2.0.0/build_info/i18n-0.6.9.info

@@ -0,0 +1 @@
+

data/vendor/bundle/ruby/2.0.0/build_info/listen-2.7.9.info

@@ -0,0 +1 @@
+

data/vendor/bundle/ruby/2.0.0/build_info/little-plugger-1.1.3.info

@@ -0,0 +1 @@
+

data/vendor/bundle/ruby/2.0.0/build_info/log4r-1.1.10.info

@@ -0,0 +1 @@
+