catfish 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74963910c0c501a10a4eb5c44ad4de8c95d25be9
-  data.tar.gz: 1041ab59f8293a410d06cd0b868085b839b9bfdf
+  metadata.gz: 6b209bc38fa7845bde7d77a923adbc95afde6e6a
+  data.tar.gz: 730626a1fde2ec8806945bfae9ae629133695b80
 SHA512:
-  metadata.gz: f26cc28d1d4b64ed91237f95f9c4397efd660796139e4fddf91e4f6eee007c1cd706881a504f4eff8ce9bd9374945b9749cccb07102cf17f3ea23649200bd87f
-  data.tar.gz: deb1cac85cd409ab9cae112b973daaaad7ad8d8fa991f2a9b1539b91bfc4f0e97a695ae5a2a21cdc747f0b6110d42b9f1a73271e18561149da6d338f3e911949
+  metadata.gz: 532e16b65a907c6b86cb9e780d429b75991988cf815d644cab49b248235f9209c7161b8f759fd71d1171c36f82cba39cefa563c82ee9b9650fb1d4ea74b8d178
+  data.tar.gz: eae765e3a7a0ae3f15c1d8b6f087cb67238f270dee1d14f8b126b2635305573ab0ae9b60d68922f69312947bf20db4b9250a7382c07bd3a314cc3d6fac9d82ce

data/.gitignore

@@ -32,3 +32,6 @@ build/
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
+
+# vagrant
+.vagrant

data/README.md

@@ -58,7 +58,6 @@ And you can even run the provisioning in parallel
 
 - Puppet provisioner support
 - Vagrant plugin support in Catfishfile
-- WinRM support
 
 ## Contributing
 

data/lib/catfish/cli.rb

@@ -38,6 +38,7 @@ module Catfish
     method_option 'ssh-username', type: :string, banner: 'SSH username'
     method_option 'ssh-private-key-path', type: :string, banner: 'Path to SSH private key'
     method_option 'servers', type: :array, banner: 'Initial list of servers to include in Catfishfile'
+    method_option 'plugins', type: :array, banner: 'Vagrant plugins to be installed'
     def init
       require 'catfish/cli/init'
       Init.new(options.dup, self).run
@@ -46,7 +47,13 @@ module Catfish
     desc 'resolve [OPTIONS]', 'Resolves the servers listed in Catfishfile to .lock'
     def resolve
       require 'catfish/cli/resolve'
-      Resolve.new(options.dup, self).run
+      Resolve.new(options.dup).run
+    end
+
+    desc 'plugin', 'Install plugins defined in Catfishfile'
+    def plugin
+      require 'catfish/cli/plugin'
+      Plugin.new(options.dup).run
     end
 
     desc 'provision [OPTIONS]', 'Provision to the servers specified in Catfishfile.lock'
@@ -54,6 +61,7 @@ module Catfish
     method_option 'parallel', type: :boolean, default: 'false', banner: 'Run provisioning in parallel'
     def provision
       invoke :resolve
+      invoke :plugin
       require 'catfish/cli/provision'
       Provision.new(options.dup).run
     end

data/lib/catfish/cli/init.rb

@@ -17,14 +17,15 @@ module Catfish
         }
 
         opts = {
-          provisioners: options[:provisioners] || [],
-          shell_paths: options['shell-paths'] || ['{{PATH_TO_YOUR_SCRIPT}}'],
-          communicator: options[:communicator] || 'ssh',
+          provisioners: options[:provisioners]      || [],
+          shell_paths: options['shell-paths']       || ['{{PATH_TO_YOUR_SCRIPT}}'],
+          communicator: options[:communicator]      || 'ssh',
           winrm_username: options['winrm-username'] || '{{YOUR_WINRM_USERNAME}}',
           winrm_password: options['winrm-password'] || '{{YOUR_WINRM_PASSWORD}}',
-          ssh_username: options['ssh-username'] || '{{YOUR_SSH_USERNAME}}',
+          ssh_username: options['ssh-username']     || '{{YOUR_SSH_USERNAME}}',
           ssh_private_key_path: options['ssh-private-key-path'] || '{{PATH_TO_YOUR_SSH_PRIVATE_KEY}}',
-          servers: options['servers'] || []
+          servers: options['servers']               || [],
+          plugins: options['plugins']               || []
         }
 
         templates.each do |src, dst|

data/lib/catfish/cli/plugin.rb

@@ -0,0 +1,19 @@
+module Catfish
+  class CLI::Plugin
+    attr_reader :options
+
+    def initialize(options)
+      @options = options
+    end
+
+    def run
+      puts 'Installing plugins'
+      builder = Dsl.new
+      builder.eval_catfishfile
+
+      builder.plugins.each do |plugin|
+        system("vagrant plugin install #{plugin}") unless `vagrant plugin list`.include? plugin
+      end
+    end
+  end
+end

data/lib/catfish/cli/provision.rb

@@ -9,7 +9,6 @@ module Catfish
     def run
       p 'Provisioning to servers using Catfishfile.lock'
       vagrant_version
-      vagrant_plugins
       begin
         # Connect to the servers. The --provider=managed is the key here.
         system("vagrant up --provider=#{options[:provider]}")
@@ -37,14 +36,6 @@ module Catfish
       fail "#{vagrant_version} or greater is a prerequisite" unless `vagrant --version`.include? vagrant_version
     end
 
-    def vagrant_plugins
-      # Make sure that the vagrant-managed-servers plugin is installed
-      plugins = ['vagrant-managed-servers']
-      plugins.each do |plugin|
-        system("vagrant plugin install #{plugin}") unless `vagrant plugin list`.include? plugin
-      end
-    end
-
     def provision
       if options[:parallel]
         machines = status.split("\n").collect do |line|

data/lib/catfish/cli/resolve.rb

@@ -1,10 +1,9 @@
 module Catfish
   class CLI::Resolve
-    attr_reader :options, :thor
+    attr_reader :options
 
-    def initialize(options, thor)
+    def initialize(options)
       @options = options
-      @thor = thor
     end
 
     def run

data/lib/catfish/dsl.rb

@@ -5,10 +5,11 @@ module Catfish
       builder.eval_catfishfile
     end
 
-    attr_accessor :servers
+    attr_accessor :servers, :plugins
 
     def initialize
       @servers = []
+      @plugins = ['vagrant-managed-servers']
     end
 
     def eval_catfishfile
@@ -20,5 +21,9 @@ module Catfish
     def server(name, *_args)
       servers << name
     end
+
+    def plugin(name, *_args)
+      plugins << name
+    end
   end
 end

data/lib/catfish/templates/Catfishfile.tt

@@ -4,3 +4,7 @@
 <% config[:servers].each do |server| -%>
 server '<%= server %>'
 <% end %>
+
+<%config[:plugins].each do |plugin| -%>
+plugin '<%= plugin %>'
+<% end %>

data/lib/catfish/templates/Vagrantfile.tt

@@ -11,7 +11,6 @@ Vagrant.configure("2") do |config|
 <% end -%>
 <% end -%>
 <% end -%>
-
 <% if config[:communicator] == 'winrm' -%>
   config.vm.communicator = '<%= config[:communicator] %>'
   config.vm.winrm.username = '<%= config[:winrm_username] %>'

data/lib/catfish/version.rb

@@ -1,3 +1,3 @@
 module Catfish
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catfish
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Christopher Baldauf
@@ -76,10 +76,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rubocop.yml
-- .vagrant/machines/10.52.100.79/managed/id
-- .vagrant/machines/10.52.100.79/managed/index_uuid
-- .vagrant/machines/10.52.101.106/managed/id
-- .vagrant/machines/10.52.101.106/managed/index_uuid
 - Gemfile
 - LICENSE
 - README.md
@@ -89,6 +85,7 @@ files:
 - lib/catfish.rb
 - lib/catfish/cli.rb
 - lib/catfish/cli/init.rb
+- lib/catfish/cli/plugin.rb
 - lib/catfish/cli/provision.rb
 - lib/catfish/cli/resolve.rb
 - lib/catfish/dsl.rb

data/.vagrant/machines/10.52.100.79/managed/id

@@ -1 +0,0 @@
-10.52.100.79

data/.vagrant/machines/10.52.100.79/managed/index_uuid

@@ -1 +0,0 @@
-43c409ec41664be6a0323efe51fadc38

data/.vagrant/machines/10.52.101.106/managed/id

@@ -1 +0,0 @@
-10.52.101.106

data/.vagrant/machines/10.52.101.106/managed/index_uuid

@@ -1 +0,0 @@
-64a8ed314d0748a9b5567f5e122dad48