vagrant-yaml 0.0.6 → 0.1.0

data/Readme.md

@@ -88,5 +88,5 @@ requests.
 CREDITS
 -------
 
-Developed and maintained by Christopher Gervais <http://ergonlogic.com/>
-
+Developed and maintained by Praxis Labs Coop <http://praxis.coop/>
+Sponsored by Poetic Systems <http://poeticsystems.com/>

data/lib/vagrant-yaml.rb

@@ -1,10 +1,6 @@
 require 'vagrant'
 require 'vagrant-yaml/errors'
-require 'vagrant-yaml/commands/yaml'
-require 'vagrant-yaml/commands/yaml_init'
-require 'vagrant-yaml/commands/yaml_update'
-
-Vagrant.commands.register(:yaml) { VagrantYaml::Command::Yaml }
+require 'vagrant-yaml/plugin'
 
 module VagrantYaml
   # The source root is the path to the root directory of the this gem.

data/lib/vagrant-yaml/command/yaml.rb

@@ -0,0 +1,69 @@
+require 'optparse'
+
+module VagrantPlugins
+  module VagrantYaml
+    module Command
+      class Yaml < Vagrant.plugin("2", :command)
+        def self.synopsis
+          "Manage YAML-based projects."
+        end
+
+        def initialize(argv, env)
+          super
+
+          @main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
+
+          @subcommands = Vagrant::Registry.new
+          @subcommands.register(:init) do
+            require File.expand_path("../yaml_init", __FILE__)
+            YamlInit
+          end
+
+          @subcommands.register(:update) do
+            require File.expand_path("../yaml_update", __FILE__)
+            YamlUpdate
+          end
+        end
+
+        def execute
+          if @main_args.include?("-h") || @main_args.include?("--help")
+            # Print the help for all the box commands.
+            return help
+          end
+
+          # If we reached this far then we must have a subcommand. If not,
+          # then we also just print the help and exit.
+          command_class = @subcommands.get(@sub_command.to_sym) if @sub_command
+          return help if !command_class || !@sub_command
+          @logger.debug("Invoking command class: #{command_class} #{@sub_args.inspect}")
+
+          # Initialize and execute the command class
+          command_class.new(@sub_args, @env).execute
+        end
+
+        # Prints the help out for this command
+        def help
+          opts = OptionParser.new do |opts|
+            opts.banner = "Usage: vagrant yaml <command> [<args>]"
+            opts.separator ""
+            opts.separator "Available subcommands:"
+
+            # Add the available subcommands as separators in order to print them
+            # out as well.
+            keys = []
+            @subcommands.each { |key, value| keys << key.to_s }
+
+            keys.sort.each do |key|
+              opts.separator "     #{key}"
+            end
+
+            opts.separator ""
+            opts.separator "For help on any individual command run `vagrant yaml COMMAND -h`"
+          end
+
+          @env.ui.info(opts.help, :prefix => false)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-yaml/command/yaml_init.rb

@@ -0,0 +1,82 @@
+require 'optparse'
+require 'vagrant/util/template_renderer'
+
+module VagrantPlugins
+  module VagrantYaml
+    module Command
+      class YamlInit < Vagrant.plugin("2", :command)
+
+        def self.synopsis
+          "Initializes a new YAML-based Vagrant environment by creating a Vagrantfile, and config directories."
+        end
+        def execute
+          options = {}
+
+          opts = OptionParser.new do |opts|
+            opts.banner = "Usage: vagrant yaml init [box-name] [box-url]"
+          end
+
+          # Parse the options
+          argv = parse_options(opts)
+          return if !argv
+
+          create_vagrantfile
+          create_directories
+          create_default_yaml(argv[0], argv[1])
+          create_local_default_yaml
+          create_symlinks
+
+          @env.ui.info(I18n.t("vagrant.plugins.yaml.commands.init.success"),
+                       :prefix => false)
+          # Success, exit status 0
+          0
+        end
+
+        def create_vagrantfile
+          save_path = @env.cwd.join("Vagrantfile")
+          raise Errors::VagrantfileExistsError if save_path.exist?
+
+          template_path = ::VagrantYaml.source_root.join("templates/Vagrantfile")
+          contents = Vagrant::Util::TemplateRenderer.render(template_path)
+          save_path.open("w+") do |f|
+            f.write(contents)
+          end
+        end
+
+        def create_directories
+          Dir.mkdir('vms-available')
+          Dir.mkdir('vms-enabled')
+          Dir.mkdir('local.d')
+        end
+
+        def create_default_yaml(box_name=nil, box_url=nil)
+          save_path = @env.cwd.join("vms-available/default.yaml")
+          raise Errors::VagrantfileExistsError if save_path.exist?
+
+          template_path = ::VagrantYaml.source_root.join("templates/default.yaml")
+          contents = Vagrant::Util::TemplateRenderer.render(template_path,
+                                                            :box_name => box_name,
+                                                            :box_url => box_url)
+          save_path.open("w+") do |f|
+            f.write(contents)
+          end
+        end
+
+        def create_local_default_yaml
+          save_path = @env.cwd.join("local.d/default.yaml")
+          raise Errors::VagrantfileExistsError if save_path.exist?
+          template_path = ::VagrantYaml.source_root.join("templates/local.default.yaml")
+          contents = Vagrant::Util::TemplateRenderer.render(template_path)
+          save_path.open("w+") do |f|
+            f.write(contents)
+          end
+        end
+
+        def create_symlinks
+          File.symlink("../vms-available/default.yaml", "vms-enabled/default.yaml")
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-yaml/command/yaml_update.rb

@@ -0,0 +1,77 @@
+require 'optparse'
+require 'vagrant/util/template_renderer'
+
+module VagrantPlugins
+  module VagrantYaml
+    module Command
+      class YamlUpdate < Vagrant.plugin("2", :command)
+        def self.synopsis
+          "Updates a YAML-based Vagrant environment."
+        end
+
+        def execute
+          options = {}
+
+          # Boolean whether we should actually go through with the update
+          # or not. This is true only if the "--force" flag is set or if the
+          # user confirms it.
+          do_update = false
+
+          opts = OptionParser.new do |opts|
+            opts.banner = "Usage: vagrant yaml update"
+
+            opts.on("-f", "--force", "Update without confirmation.") do |f|
+              options[:force] = f
+            end
+          end
+
+          # Parse the options
+          argv = parse_options(opts)
+          return if !argv
+
+          if options[:force]
+            do_update = true
+          else
+            choice = nil
+            begin
+              choice = @env.ui.ask(I18n.t("vagrant.plugins.yaml.commands.update.confirmation"))
+
+            rescue Errors::UIExpectsTTY
+              # We raise a more specific error but one which basically
+              # means the same thing.
+              raise Errors::UpdateRequiresForce
+            end
+            do_update = choice.upcase == "Y"
+          end
+
+          if do_update
+            @logger.info("Updating project with latest Vagrantfile from vagrant-yaml.")
+            update
+          else
+            @logger.info("Not updating project since confirmation was declined.")
+            @env.ui.success(I18n.t("vagrant.plugins.yaml.commands.update.will_not_update"),
+                              :prefix => false)
+          end
+        end
+
+        def update
+          save_path = @env.cwd.join("Vagrantfile")
+
+          template_path = ::VagrantYaml.source_root.join("templates/Vagrantfile")
+          contents = Vagrant::Util::TemplateRenderer.render(template_path)
+
+          # Write out the contents
+          save_path.open("w+") do |f|
+            f.write(contents)
+          end
+
+          @env.ui.info(I18n.t("vagrant.plugins.yaml.commands.update.success"),
+                       :prefix => false)
+
+          # Success, exit status 0
+          0
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-yaml/plugin.rb

@@ -0,0 +1,26 @@
+module VagrantPlugins
+  module VagrantYaml
+    class Plugin < Vagrant.plugin("2")
+      name "Yagrant YAML"
+      description <<-DESC
+      This plugin enables Vagrant to use YAML files to configure VMs.
+      DESC
+
+      command("yaml") do
+        require_relative "command/yaml"
+        Command::Yaml
+      end
+
+      command("yaml-init", primary: false) do
+        require_relative "command/yaml_init"
+        Command::YamlInit
+      end
+
+      command("yaml-update", primary: false) do
+        require_relative "command/yaml_update"
+        Command::YamlUpdate
+      end
+    end
+  end
+end
+

data/lib/vagrant-yaml/version.rb

@@ -1,3 +1,3 @@
 module VagrantYaml
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-yaml
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -41,12 +41,12 @@ files:
 - LICENSE
 - Readme.md
 - lib/vagrant-yaml.rb
-- lib/vagrant-yaml/commands/yaml.rb
-- lib/vagrant-yaml/commands/yaml_init.rb
-- lib/vagrant-yaml/commands/yaml_update.rb
+- lib/vagrant-yaml/command/yaml.rb
+- lib/vagrant-yaml/command/yaml_init.rb
+- lib/vagrant-yaml/command/yaml_update.rb
 - lib/vagrant-yaml/errors.rb
+- lib/vagrant-yaml/plugin.rb
 - lib/vagrant-yaml/version.rb
-- lib/vagrant_init.rb
 - locales/en.yml
 - templates/Vagrantfile.erb
 - templates/default.yaml.erb

data/lib/vagrant-yaml/commands/yaml.rb

@@ -1,60 +0,0 @@
-require 'optparse'
-require 'vagrant/util/template_renderer'
-require 'vagrant/command/base'
-
-module VagrantYaml
-  module Command
-
-    class Yaml < Vagrant::Command::Base
-      def initialize(argv, env)
-        super
-
-        @main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
-
-        @subcommands = Vagrant::Registry.new
-        @subcommands.register(:init)       { VagrantYaml::Command::YamlInit }
-        @subcommands.register(:update)     { VagrantYaml::Command::YamlUpdate }
-      end
-
-      def execute
-        if @main_args.include?("-h") || @main_args.include?("--help")
-          # Print the help for all the box commands.
-          return help
-        end
-
-        # If we reached this far then we must have a subcommand. If not,
-        # then we also just print the help and exit.
-        command_class = @subcommands.get(@sub_command.to_sym) if @sub_command
-        return help if !command_class || !@sub_command
-        @logger.debug("Invoking command class: #{command_class} #{@sub_args.inspect}")
-
-        # Initialize and execute the command class
-        command_class.new(@sub_args, @env).execute
-      end
-
-      # Prints the help out for this command
-      def help
-        opts = OptionParser.new do |opts|
-          opts.banner = "Usage: vagrant yaml <command> [<args>]"
-          opts.separator ""
-          opts.separator "Available subcommands:"
-
-          # Add the available subcommands as separators in order to print them
-          # out as well.
-          keys = []
-          @subcommands.each { |key, value| keys << key.to_s }
-
-          keys.sort.each do |key|
-            opts.separator "     #{key}"
-          end
-
-          opts.separator ""
-          opts.separator "For help on any individual command run `vagrant yaml COMMAND -h`"
-        end
-
-        @env.ui.info(opts.help, :prefix => false)
-      end
-    end
-  end
-end
-

data/lib/vagrant-yaml/commands/yaml_init.rb

@@ -1,79 +0,0 @@
-require 'optparse'
-require 'vagrant/util/template_renderer'
-require 'vagrant/command/base'
-
-module VagrantYaml
-  module Command
-
-    class YamlInit < Vagrant::Command::Base
-      def execute
-        options = {}
-
-        opts = OptionParser.new do |opts|
-          opts.banner = "Usage: vagrant yaml init [box-name] [box-url]"
-        end
-
-        # Parse the options
-        argv = parse_options(opts)
-        return if !argv
-
-        create_vagrantfile
-        create_directories
-        create_default_yaml(argv[0], argv[1])
-        create_local_default_yaml
-        create_symlinks
-
-        @env.ui.info(I18n.t("vagrant.plugins.yaml.commands.init.success"),
-                     :prefix => false)
-        # Success, exit status 0
-        0
-      end
-
-      def create_vagrantfile
-        save_path = @env.cwd.join("Vagrantfile")
-        raise Errors::VagrantfileExistsError if save_path.exist?
-
-        template_path = ::VagrantYaml.source_root.join("templates/Vagrantfile")
-        contents = Vagrant::Util::TemplateRenderer.render(template_path)
-        save_path.open("w+") do |f|
-          f.write(contents)
-        end
-      end
-
-      def create_directories
-        Dir.mkdir('vms-available')
-        Dir.mkdir('vms-enabled')
-        Dir.mkdir('local.d')
-      end
-
-      def create_default_yaml(box_name=nil, box_url=nil)
-        save_path = @env.cwd.join("vms-available/default.yaml")
-        raise Errors::VagrantfileExistsError if save_path.exist?
-
-        template_path = ::VagrantYaml.source_root.join("templates/default.yaml")
-        contents = Vagrant::Util::TemplateRenderer.render(template_path,
-                                                          :box_name => box_name,
-                                                          :box_url => box_url)
-        save_path.open("w+") do |f|
-          f.write(contents)
-        end
-      end
-
-      def create_local_default_yaml
-        save_path = @env.cwd.join("local.d/default.yaml")
-        raise Errors::VagrantfileExistsError if save_path.exist?
-        template_path = ::VagrantYaml.source_root.join("templates/local.default.yaml")
-        contents = Vagrant::Util::TemplateRenderer.render(template_path)
-        save_path.open("w+") do |f|
-          f.write(contents)
-        end
-      end
-
-      def create_symlinks
-        File.symlink("../vms-available/default.yaml", "vms-enabled/default.yaml")
-      end
-
-    end
-  end
-end
-

data/lib/vagrant-yaml/commands/yaml_update.rb

@@ -1,74 +0,0 @@
-require 'optparse'
-require 'vagrant/util/template_renderer'
-require 'vagrant/command/base'
-
-module VagrantYaml
-  module Command
-
-    class YamlUpdate < Vagrant::Command::Base
-      def execute
-        options = {}
-
-        # Boolean whether we should actually go through with the update
-        # or not. This is true only if the "--force" flag is set or if the
-        # user confirms it.
-        do_update = false
-
-        opts = OptionParser.new do |opts|
-          opts.banner = "Usage: vagrant yaml update"
-
-          opts.on("-f", "--force", "Update without confirmation.") do |f|
-            options[:force] = f
-          end
-        end
-
-        # Parse the options
-        argv = parse_options(opts)
-        return if !argv
-
-        if options[:force]
-          do_update = true
-        else
-          choice = nil
-          begin
-            choice = @env.ui.ask(I18n.t("vagrant.plugins.yaml.commands.update.confirmation"))
-
-          rescue Errors::UIExpectsTTY
-            # We raise a more specific error but one which basically
-            # means the same thing.
-            raise Errors::UpdateRequiresForce
-          end
-          do_update = choice.upcase == "Y"
-        end
-
-        if do_update
-          @logger.info("Updating project with latest Vagrantfile from vagrant-yaml.")
-          update
-        else
-          @logger.info("Not updating project since confirmation was declined.")
-          @env.ui.success(I18n.t("vagrant.plugins.yaml.commands.update.will_not_update"),
-                            :prefix => false)
-        end
-      end
-
-      def update
-        save_path = @env.cwd.join("Vagrantfile")
-
-        template_path = ::VagrantYaml.source_root.join("templates/Vagrantfile")
-        contents = Vagrant::Util::TemplateRenderer.render(template_path)
-
-        # Write out the contents
-        save_path.open("w+") do |f|
-          f.write(contents)
-        end
-
-        @env.ui.info(I18n.t("vagrant.plugins.yaml.commands.update.success"),
-                     :prefix => false)
-
-        # Success, exit status 0
-        0
-      end
-    end
-  end
-end
-

data/lib/vagrant_init.rb

@@ -1,3 +0,0 @@
-# This file is automatically loaded by Vagrant to load any
-# plugins. This file kicks off this plugin.
-require 'vagrant-yaml'