katar 2.0.0 → 2.1.0

data/bin/katar

@@ -1,6 +1,6 @@
-#!/usr/bin/env ruby
-
-katar_path = File.expand_path('../../lib', __FILE__)
-$LOAD_PATH.unshift(katar_path)
-
+#!/usr/bin/env ruby
+
+katar_path = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(katar_path)
+
 require "katar/cli"

data/katar.gemspec

@@ -1,26 +1,26 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'katar/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "katar"
-  spec.version       = Katar::VERSION
-  spec.authors       = ["AcMitch"]
-  spec.email         = ["adam.cameron.mitchell@gmail.com"]
-  spec.summary       = "Katar provides a simple, elegant way to manage and provision a Vagrant box on your local machine."
-  spec.description   = "Katar provides a simple, elegant way to manage and provision a Vagrant box on your local machine."
-  spec.homepage      = ""
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = ["katar"]
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency 'rspec', '~> 3.3', '>= 3.3.0'
-  spec.add_runtime_dependency 'rubyzip', '~> 1.1', '>= 1.1.7'
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_dependency "thor", "~> 0.19.1"
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'katar/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "katar"
+  spec.version       = Katar::VERSION
+  spec.authors       = ["AcMitch"]
+  spec.email         = ["adam.cameron.mitchell@gmail.com"]
+  spec.summary       = "Katar provides a simple, elegant way to manage and provision a Vagrant box on your local machine."
+  spec.description   = "Katar provides a simple, elegant way to manage and provision a Vagrant box on your local machine."
+  spec.homepage      = ""
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = ["katar"]
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency 'rspec', '~> 3.3', '>= 3.3.0'
+  spec.add_runtime_dependency 'rubyzip', '~> 1.1', '>= 1.1.7'
+  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_dependency "thor", "~> 0.19.1"
+end

data/lib/katar.rb

@@ -1,5 +1,5 @@
-require "katar/version"
-
-module Katar
-    
-end
+require "katar/version"
+
+module Katar
+    
+end

data/lib/katar/cli.rb

@@ -1,3 +1,3 @@
-require "katar/commands/application"
-
+require "katar/commands/application"
+
 Katar::Commands::Application.start(ARGV)

data/lib/katar/commands/application.rb

@@ -1,88 +1,88 @@
-require "katar/globals"
-require "katar/version"
-require "thor"
-
-module Katar
-    module Commands
-        class Application < Thor
-
-            desc "version", "Show Katar version number"
-            def version
-                puts Katar::VERSION
-            end
-
-            desc "init", "Create a stub Katar.yaml file"
-            def init
-                require_command!("init_command")
-            end
-
-            desc "edit", "Edit the Katar.yaml file"
-            def edit
-                require_command!("edit_command")
-            end
-
-            desc "up", "Start the Katar machine"
-            def up
-                run_command "vagrant up"
-            end 
-
-            desc "ssh", "Login to the Katar machine via SSH"
-            def ssh
-                run_command "vagrant ssh"
-            end
-
-            desc "suspend", "Suspend the Katar machine"
-            def suspend
-                run_command "vagrant suspend"
-            end
-
-            desc "resume", "Resume the suspended Katar machine"
-            def resume
-                run_command "vagrant resume"
-            end
-
-            desc "reload", "Reload the Katar machine image"
-            def reload
-                run_command "vagrant reload"
-            end
-
-            desc "destroy", "Destroy the Katar machine"
-            def destroy
-                run_command "vagrant destroy"
-            end
-
-            desc "status", "Get the status of the Katar machine"
-            def status
-                run_command "vagrant status"
-            end
-
-            desc "halt", "Halt the Katar machine"
-            def halt
-                run_command "vagrant halt"
-            end
-
-            desc "provision", "Re-provisions the Katar machine"
-            def provision
-                run_command "vagrant provision"
-            end
-
-            desc "update", "Update the Katar machine image"
-            def update
-                run_command "vagrant box update"
-            end
-
-        private
-
-            def run_command(command)
-                Dir.chdir(  File.join(File.dirname(__FILE__), '../../../')  ){
-                    exec command
-                }
-            end
-
-            def require_command!(command)
-                require "katar/commands/#{command}"
-            end
-
-        end
-    end
+require "katar/globals"
+require "katar/version"
+require "thor"
+
+module Katar
+    module Commands
+        class Application < Thor
+
+            desc "version", "Show Katar version number"
+            def version
+                puts Katar::VERSION
+            end
+
+            desc "init", "Create a stub Katar.yaml file"
+            def init
+                require_command!("init_command")
+            end
+
+            desc "edit", "Edit the Katar.yaml file"
+            def edit
+                require_command!("edit_command")
+            end
+
+            desc "up", "Start the Katar machine"
+            def up
+                run_command "vagrant up"
+            end 
+
+            desc "ssh", "Login to the Katar machine via SSH"
+            def ssh
+                run_command "vagrant ssh"
+            end
+
+            desc "suspend", "Suspend the Katar machine"
+            def suspend
+                run_command "vagrant suspend"
+            end
+
+            desc "resume", "Resume the suspended Katar machine"
+            def resume
+                run_command "vagrant resume"
+            end
+
+            desc "reload", "Reload the Katar machine image"
+            def reload
+                run_command "vagrant reload"
+            end
+
+            desc "destroy", "Destroy the Katar machine"
+            def destroy
+                run_command "vagrant destroy"
+            end
+
+            desc "status", "Get the status of the Katar machine"
+            def status
+                run_command "vagrant status"
+            end
+
+            desc "halt", "Halt the Katar machine"
+            def halt
+                run_command "vagrant halt"
+            end
+
+            desc "provision", "Re-provisions the Katar machine"
+            def provision
+                run_command "vagrant provision"
+            end
+
+            desc "update", "Update the Katar machine image"
+            def update
+                run_command "vagrant box update"
+            end
+
+        private
+
+            def run_command(command)
+                Dir.chdir(  File.join(File.dirname(__FILE__), '../../../')  ){
+                    exec command
+                }
+            end
+
+            def require_command!(command)
+                require "katar/commands/#{command}"
+            end
+
+        end
+    end
 end

data/lib/katar/commands/edit_command.rb

@@ -1,28 +1,28 @@
-require "thor"
-
-module Katar
-    module Commands
-        class EditCommand < Thor
-
-            desc "edit", "Edit the Katar.yaml file"
-            def edit
-
-                if windows?
-                    exec "start #{Katar::DIR}/Katar.yaml"
-                end
-
-                exec "open #{Katar::DIR}/Katar.yaml"
-
-            end
-
-            private 
-
-            def windows?
-                (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
-            end
-
-        end
-    end
-end
-
+require "thor"
+
+module Katar
+    module Commands
+        class EditCommand < Thor
+
+            desc "edit", "Edit the Katar.yaml file"
+            def edit
+
+                if windows?
+                    exec "start #{Katar::DIR}/Katar.yaml"
+                end
+
+                exec "open #{Katar::DIR}/Katar.yaml"
+
+            end
+
+            private 
+
+            def windows?
+                (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
+            end
+
+        end
+    end
+end
+
 Katar::Commands::EditCommand.start(ARGV)

data/lib/katar/commands/init_command.rb

@@ -1,28 +1,28 @@
-require 'fileutils'
-require "thor"
-
-module Katar
-    module Commands
-        class InitCommand < Thor
-
-            desc "init", "Create a stub Katar.yaml file"
-            def init
-                create_directory and copy_stubs
-                puts "Katar initialized!"
-            end
-
-            private
-
-            def create_directory
-                Dir.mkdir Katar::DIR if ! Dir.exists? Katar::DIR
-            end
-
-            def copy_stubs
-                FileUtils.cp_r File.expand_path('../../../stubs', __FILE__) + "/.", Katar::DIR
-            end
-
-        end
-    end
-end
-
+require 'fileutils'
+require "thor"
+
+module Katar
+    module Commands
+        class InitCommand < Thor
+
+            desc "init", "Create a stub Katar.yaml file"
+            def init
+                create_directory and copy_stubs
+                puts "Katar initialized!"
+            end
+
+            private
+
+            def create_directory
+                Dir.mkdir Katar::DIR if ! Dir.exists? Katar::DIR
+            end
+
+            def copy_stubs
+                FileUtils.cp_r File.expand_path('../../../stubs', __FILE__) + "/.", Katar::DIR
+            end
+
+        end
+    end
+end
+
 Katar::Commands::InitCommand.start(ARGV)

data/lib/katar/globals.rb

@@ -1,3 +1,3 @@
-module Katar
-    DIR = File.expand_path("~/.katar")
+module Katar
+    DIR = File.expand_path("~/.katar")
 end

data/lib/katar/vagrant.rb

@@ -1,145 +1,150 @@
-module Katar
-    def Katar.configure(config, settings)
-        # Set The VM Provider
-        ENV['VAGRANT_DEFAULT_PROVIDER'] = settings["provider"] = "virtualbox"
-
-        # Configure Local Variable To Access Scripts From Remote Location
-        scriptDir = File.expand_path('../../scripts', __FILE__)
-
-        # Prevent TTY Errors
-        config.ssh.shell = "bash -c 'BASH_ENV=/etc/profile exec bash'"
-
-        # Allow SSH Agent Forward from The Box
-        config.ssh.forward_agent = true
-
-        # Configure The Box
-        config.vm.box = settings["box"] ||= "acmitch/katar-box"
-        config.vm.box_version = settings["version"] ||= ">= 0"
-        config.vm.hostname = settings["hostname"] ||= "katar"
-
-        # Configure A Private Network IP
-        config.vm.network :private_network, ip: settings["ip"] ||= "192.168.10.11"
-
-        # Configure A Few VirtualBox Settings
-        config.vm.provider "virtualbox" do |vb|
-            vb.name = settings["name"] ||= "katar"
-            vb.gui = settings["desktop"] ||= false
-            vb.customize ["modifyvm", :id, "--memory", settings["memory"] ||= "2048"]
-            vb.customize ["modifyvm", :id, "--cpus", settings["cpus"] ||= "1"]
-            vb.customize ["modifyvm", :id, "--natdnsproxy1", "on"]
-            vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
-            vb.customize ["modifyvm", :id, "--ostype", "Ubuntu_64"]
-            vb.customize ["modifyvm", :id, "--clipboard", "bidirectional"]
-        end
- 
-        # Configure A Few Parallels Settings
-        config.vm.provider "parallels" do |v|
-            v.update_guest_tools = true
-            v.memory = settings["memory"] ||= 2048
-            v.cpus = settings["cpus"] ||= 1
-        end
-
-        # Configure Proxies
-        if settings.include? "proxies"
-            if !Vagrant.has_plugin?("vagrant-proxyconf") 
-                system('vagrant plugin install vagrant-proxyconf')     
-                raise("vagrant-proxyconf installed. Run command again.");
-            end
-
-            settings["proxies"].each do |proxy|
-                # Environment and package managers
-                config.proxy.http = proxy["http"] ||= nil
-                config.proxy.https = proxy["https"] ||= nil 
-            end
-        end
-
-        # Standardize Ports Naming Schema
-        if (settings.has_key?("ports"))
-            settings["ports"].each do |port|
-                port["guest"] ||= port["to"]
-                port["host"] ||= port["send"]
-                port["protocol"] ||= "tcp"
-            end
-        else
-            settings["ports"] = []
-        end
-
-        # Default Port Forwarding
-        default_ports = {
-            80   => 8000,
-            443  => 44300,
-            3306 => 33060,
-            5432 => 54320
-        }
-
-        # Use Default Port Forwarding Unless Overridden
-        default_ports.each do |guest, host|
-            unless settings["ports"].any? { |mapping| mapping["guest"] == guest }
-                config.vm.network "forwarded_port", guest: guest, host: host, auto_correct: true
-            end
-        end
-
-        # Add Custom Ports From Configuration
-        if settings.has_key?("ports")
-            settings["ports"].each do |port|
-                config.vm.network "forwarded_port", guest: port["guest"], host: port["host"], protocol: port["protocol"], auto_correct: true
-            end
-        end
-
-        # Configure The Public Key For SSH Access
-        if settings.include? 'authorize'
-            if File.exists? File.expand_path(settings["authorize"])
-                config.vm.provision "shell" do |s|
-                    s.inline = "echo $1 | grep -xq \"$1\" /home/vagrant/.ssh/authorized_keys || echo $1 | tee -a /home/vagrant/.ssh/authorized_keys"
-                    s.args = [File.read(File.expand_path(settings["authorize"]))]
-                end
-            end
-        end
-
-        # Copy The SSH Private Keys To The Box
-        if settings.include? 'keys'
-            settings["keys"].each do |key|
-                config.vm.provision "shell" do |s|
-                    s.privileged = false
-                    s.inline = "echo \"$1\" > /home/vagrant/.ssh/$2 && chmod 600 /home/vagrant/.ssh/$2"
-                    s.args = [File.read(File.expand_path(key)), key.split('/').last]
-                end
-            end
-        end
-
-        # Register All Of The Configured Shared Folders
-        if settings.include? 'folders'
-            settings["folders"].each do |folder|
-
-                if (folder["type"] == "nfs")
-                    mount_opts = folder["mount_options"] ? folder["mount_options"] : ['actimeo=1']
-                else
-                    mount_opts = folder["mount_options"] ? folder["mount_options"] : []
-                end
-
-                # For b/w compatibility keep separate 'mount_opts', but merge with options
-                options = (folder["options"] || {}).merge({ mount_options: mount_opts })
-
-                # Double-splat (**) operator only works with symbol keys, so convert
-                options.keys.each{|k| options[k.to_sym] = options.delete(k) }
-
-                config.vm.synced_folder folder["map"], folder["to"], type: folder["type"] ||= nil, **options
-            end
-        end
- 
-        # Configure All Of The Server Environment Variables
-        config.vm.provision "shell" do |s|
-            s.path = scriptDir + "/clear-variables.sh"
-        end
-
-        if settings.has_key?("variables")
-            settings["variables"].each do |var|
-                config.vm.provision "shell" do |s|
-                    s.inline = "echo \"\n# Set Katar Environment Variable\nexport $1=$2\" >> /home/vagrant/.profile"
-                    s.args = [var["key"], var["value"]]
-                end
-            end
-        end
-         
-    end
+module Katar
+    def Katar.configure(config, settings)
+        # Set The VM Provider
+        ENV['VAGRANT_DEFAULT_PROVIDER'] = settings["provider"] = "virtualbox"
+
+        # Configure Local Variable To Access Scripts From Remote Location
+        scriptDir = File.expand_path('../../scripts', __FILE__)
+
+        # Prevent TTY Errors
+        config.ssh.shell = "bash -c 'BASH_ENV=/etc/profile exec bash'"
+
+        # Allow SSH Agent Forward from The Box
+        config.ssh.forward_agent = true
+
+        # Configure The Box
+        config.vm.box = settings["box"] ||= "acmitch/katar-box"
+        config.vm.box_version = settings["version"] ||= ">= 0"
+        config.vm.hostname = settings["hostname"] ||= "katar"
+
+        # Configure A Private Network IP
+        config.vm.network :private_network, ip: settings["ip"] ||= "192.168.10.11"
+
+        # Configure A Few VirtualBox Settings
+        config.vm.provider "virtualbox" do |vb|
+            vb.name = settings["name"] ||= "katar"
+            vb.gui = settings["desktop"] ||= false
+            vb.customize ["modifyvm", :id, "--memory", settings["memory"] ||= "2048"]
+            vb.customize ["modifyvm", :id, "--cpus", settings["cpus"] ||= "1"]
+            vb.customize ["modifyvm", :id, "--natdnsproxy1", "on"]
+            vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
+            vb.customize ["modifyvm", :id, "--ostype", "Ubuntu_64"]
+            vb.customize ["modifyvm", :id, "--clipboard", "bidirectional"] 
+        end
+ 
+        # Configure A Few Parallels Settings
+        config.vm.provider "parallels" do |v|
+            v.update_guest_tools = true
+            v.memory = settings["memory"] ||= 2048
+            v.cpus = settings["cpus"] ||= 1
+        end
+
+        # Configure Proxies
+        if settings.include? "proxies"
+            if !Vagrant.has_plugin?("vagrant-proxyconf") 
+                system('vagrant plugin install vagrant-proxyconf')     
+                raise("vagrant-proxyconf installed. Run command again.");
+            end
+
+            settings["proxies"].each do |proxy|
+                # Environment and package managers
+                config.proxy.http = proxy["http"] ||= nil
+                config.proxy.https = proxy["https"] ||= nil 
+            end
+        end
+
+        # Standardize Ports Naming Schema
+        if (settings.has_key?("ports"))
+            settings["ports"].each do |port|
+                port["guest"] ||= port["to"]
+                port["host"] ||= port["send"]
+                port["protocol"] ||= "tcp"
+            end
+        else
+            settings["ports"] = []
+        end
+
+        # Default Port Forwarding
+        default_ports = {
+            80   => 8000,
+            443  => 44300,
+            3306 => 33060,
+            5432 => 54320
+        }
+
+        # Use Default Port Forwarding Unless Overridden
+        default_ports.each do |guest, host|
+            unless settings["ports"].any? { |mapping| mapping["guest"] == guest }
+                config.vm.network "forwarded_port", guest: guest, host: host, auto_correct: true
+            end
+        end
+
+        # Add Custom Ports From Configuration
+        if settings.has_key?("ports")
+            settings["ports"].each do |port|
+                config.vm.network "forwarded_port", guest: port["guest"], host: port["host"], protocol: port["protocol"], auto_correct: true
+            end
+        end
+
+        # Configure The Public Key For SSH Access
+        if settings.include? 'authorize'
+            if File.exists? File.expand_path(settings["authorize"])
+                config.vm.provision "shell" do |s|
+                    s.inline = "echo $1 | grep -xq \"$1\" /home/vagrant/.ssh/authorized_keys || echo $1 | tee -a /home/vagrant/.ssh/authorized_keys"
+                    s.args = [File.read(File.expand_path(settings["authorize"]))]
+                end
+            end
+        end
+
+        # Copy The SSH Private Keys To The Box
+        if settings.include? 'keys'
+            settings["keys"].each do |key|
+                config.vm.provision "shell" do |s|
+                    s.privileged = false
+                    s.inline = "echo \"$1\" > /home/vagrant/.ssh/$2 && chmod 600 /home/vagrant/.ssh/$2"
+                    s.args = [File.read(File.expand_path(key)), key.split('/').last]
+                end
+            end
+        end
+
+        if settings.include? 'folders'
+          settings["folders"].each do |folder|
+            mount_opts = []
+
+            if (folder["type"] == "nfs")
+                mount_opts = folder["mount_options"] ? folder["mount_options"] : ['actimeo=1', 'nolock']
+            elsif (folder["type"] == "smb")
+                mount_opts = folder["mount_options"] ? folder["mount_options"] : ['vers=3.02', 'mfsymlinks']
+            end
+
+            # For b/w compatibility keep separate 'mount_opts', but merge with options
+            options = (folder["options"] || {}).merge({ mount_options: mount_opts })
+
+            # Double-splat (**) operator only works with symbol keys, so convert
+            options.keys.each{|k| options[k.to_sym] = options.delete(k) }
+
+            config.vm.synced_folder folder["map"], folder["to"], type: folder["type"] ||= nil, **options
+
+            # Bindfs support to fix shared folder (NFS) permission issue on Mac
+            if Vagrant.has_plugin?("vagrant-bindfs")
+              config.bindfs.bind_folder folder["to"], folder["to"]
+            end
+          end
+        end
+ 
+        # Configure All Of The Server Environment Variables
+        config.vm.provision "shell" do |s|
+            s.path = scriptDir + "/clear-variables.sh"
+        end
+
+        if settings.has_key?("variables")
+            settings["variables"].each do |var|
+                config.vm.provision "shell" do |s|
+                    s.inline = "echo \"\n# Set Katar Environment Variable\nexport $1=$2\" >> /home/vagrant/.profile"
+                    s.args = [var["key"], var["value"]]
+                end
+            end
+        end
+         
+    end
 end