vagrant-shortcuts 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e94cfdd7ea4c44cfd7229753110286711a8d56d
-  data.tar.gz: bd63397478fadfe26c7063db0967367a3610c932
+  metadata.gz: 71d2c0e6f8bcb8ac7e62e3759b0fcd3d1adf87d8
+  data.tar.gz: baac53ae8c2bd4c46879822dcbd551a0435aad7c
 SHA512:
-  metadata.gz: 9c1460c365caa674562192e88114f6d047e6ce597d2c1eb26191d228558625b04671a2a244932524ee358be6283076d32cd0d90a77101ca3fe5d84817674473a
-  data.tar.gz: 0363294843abab4f01b45613d3238480e219bc60b9b9a3f30dcd0a537f5b9db5add022c18c6de6a3a3433c0718f9db4ccb51cfa7aef601c528d92a16c5a8523d
+  metadata.gz: 817dfc4ce02cebd664f8a098845fefba8753ab4fe88e1a71a8459eacc89015fd5b93fa01d2071266b284f2073b257085a3ed861212e3c1ac89dd2a2ea9dd4c7f
+  data.tar.gz: 2a3e0e12abc1087778d732572395295c149d3730f39ab0e3868dd5de503279a5a21997871bcded76ea878f06d9af6e3f3c3c96295240b24b36967196bbd67bce

data/.gitignore

@@ -12,3 +12,4 @@
 *.o
 *.a
 mkmf.log
+*.gem

data/lib/vagrant-shortcuts.rb

@@ -2,57 +2,107 @@ require "vagrant-shortcuts/version"
 
 module VagrantPlugins
 
-  class Shortcut
-    def initialize(callable, start_machine: true)
-      @callable = callable
-      @start_machine = start_machine
+  module Shortcuts
+
+    # Get some i18n going
+    def self.setup_i18n
+      I18n.load_path << File.expand_path('locales/en.yml', source_root)
+      I18n.reload!
     end
 
-    def call(machine)
-      if @start_machine
-        machine.action(:up, {:provision_ignore_sentinel => false})
-      end
-      @callable.call(machine)
+    def self.source_root
+      @source_root ||= Pathname.new(File.expand_path("../../", __FILE__))
     end
-  end
 
-  class Shortcuts < Vagrant.plugin("2")
-    name "Shortcuts plugin"
+    # `Shortcut` handles running shortcuts and any associated options
+    class Shortcut
+      def initialize(callable, start_machine: true)
+        @callable = callable
+        @start_machine = start_machine
+      end
 
-    command "do" do
-      class Command < Vagrant.plugin("2", :command)
-        def initialize(argv, env)
-          super
-          @main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
+      def call(machine)
+        if @start_machine
+          machine.action(:up, {:provision_ignore_sentinel => false})
         end
+        @callable.call(machine)
+      end
+    end
+
+    class Plugin < Vagrant.plugin("2")
+      name "Shortcuts plugin"
+      description <<-DESC
+      This plugin allows defining shortcut commands in a Vagrantfile
+      DESC
+
+      # Where the real work is done: Running a shortcut
+      command "do" do
+        class Command < Vagrant.plugin("2", :command)
+          def initialize(argv, env)
+            super
+            @main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
+
+            # Not a great spot for this, but I dont know where else to put it.
+            Shortcuts.setup_i18n
+          end
+
+          def execute
+            with_target_vms(@sub_args) do |machine|
+
+              if @sub_command == nil
+                raise MissingShortcutError.new
+              end
+
+              shortcut_name = @sub_command.to_sym
+              shortcuts = machine.config.shortcuts
+
+              if not shortcuts.has?(shortcut_name)
+                raise UnknownShortcutError.new shortcut: shortcut_name
+              end
 
-        def execute
-          with_target_vms(@sub_args) do |machine|
-            shortcut_name = @sub_command.to_sym
-            shortcut = machine.config.shortcuts.get(shortcut_name)
-            shortcut.call(machine)
+              shortcut = machine.config.shortcuts.get(shortcut_name)
+              shortcut.call(machine)
+            end
+            0
           end
-          0
         end
+        Command
       end
-      Command
-    end
 
-    config "shortcuts" do
-      class Config < Vagrant.plugin(2, :config)
-        attr_accessor :shortcuts
+      # Add a new config group for shortcuts.
+      # End-users should only really care about `add`
+      config "shortcuts" do
+        class Config < Vagrant.plugin(2, :config)
+          attr_accessor :shortcuts
 
-        def initialize
-          @shortcuts = {}
-        end
-        def add(name, *args, &block)
-          @shortcuts[name] = Shortcut.new(block, *args)
-        end
-        def get(name)
-          @shortcuts[name]
+          def initialize
+            @shortcuts = {}
+          end
+          def add(name, *args, &block)
+            @shortcuts[name] = Shortcut.new(block, *args)
+          end
+          def get(name)
+            @shortcuts[name]
+          end
+          def has?(name)
+            return @shortcuts.key?(name)
+          end
         end
+        Config
       end
-      Config
+    end
+
+    # For when stuff breaks
+    class ShortcutsError < Vagrant::Errors::VagrantError
+      error_namespace("vagrant.plugins.shortcuts")
+    end
+
+    class MissingShortcutError < ShortcutsError
+      error_key(:missing_shortcut)
+    end
+
+    class UnknownShortcutError < ShortcutsError
+      error_key(:unknown_shortcut)
     end
   end
 end

data/lib/vagrant-shortcuts/version.rb

@@ -1,3 +1,3 @@
 module VagrantShortcuts
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/locales/en.yml

@@ -0,0 +1,6 @@
+en:
+    vagrant:
+        plugins:
+            shortcuts:
+                unknown_shortcut: "Unknown shortcut: %{shortcut}"
+                missing_shortcut: "You must name a shortcut to run\n\n    vagrant do <shortcut>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-shortcuts
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Tim Heap
@@ -52,6 +52,7 @@ files:
 - Rakefile
 - lib/vagrant-shortcuts.rb
 - lib/vagrant-shortcuts/version.rb
+- locales/en.yml
 - vagrant-shortcuts.gemspec
 homepage: https://bitbucket.org/tim_heap/vagrant-shortcuts
 licenses: