catfish 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b209bc38fa7845bde7d77a923adbc95afde6e6a
-  data.tar.gz: 730626a1fde2ec8806945bfae9ae629133695b80
+  metadata.gz: bd4f16456fc2a0292aaa6f563b208221a7d773f1
+  data.tar.gz: 5427abeed216170b88c413e07c561bfed507579b
 SHA512:
-  metadata.gz: 532e16b65a907c6b86cb9e780d429b75991988cf815d644cab49b248235f9209c7161b8f759fd71d1171c36f82cba39cefa563c82ee9b9650fb1d4ea74b8d178
-  data.tar.gz: eae765e3a7a0ae3f15c1d8b6f087cb67238f270dee1d14f8b126b2635305573ab0ae9b60d68922f69312947bf20db4b9250a7382c07bd3a314cc3d6fac9d82ce
+  metadata.gz: 9d66e6106c7a1b0d6b3e3dc145fd1d5fe43e35a98f94d14c6c63e3289f46bf620a7b9883381950e43ed6d97d76f77936d735d063162f438afbfbad7de76cb26d
+  data.tar.gz: 8d57477e3863d3660c7d9804b8ec04ef0e8a4c272ebcdb7d5f291a58c97e767d5f66994184c7629363e5cdc88c8ba2b5a626407c2dec2776bbb9d58ee574b89d

data/.gitignore

@@ -35,3 +35,6 @@ build/
 
 # vagrant
 .vagrant
+.librarian
+.tmp
+modules/

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+rvm:
+- 1.9.3
+- 2.0.0
+notifications:
+  email:
+  - chris.baldauf@gmail.com
+deploy:
+  provider: rubygems
+  on:
+    tags: true
+  api_key:
+    secure: rt3BC6VAszR2ZxjlEmW6AJiqDa/12GdY5KXL4VEXnagyIT9UEjCBHzaNdBTFeSagEskMlMxgNi/UCpGg8eWXbSoesIpFdVBo8W8drNDf13eCMgfJaI5TeWnc5DYRJEduXRNdWTmznUQ8DYZylExeTFKxAAZdiceGBq4bJGFtzc8=

data/README.md

@@ -50,6 +50,16 @@ And you can even run the provisioning in parallel
 
     $ catfish provision --parallel
 
+### Plugins
+You can have catfish ensure that vagrant plugins are installed via the 'plugin'
+directive in your Catfishfile.
+
+```ruby
+plugin 'vagrant-hostmaster'
+```
+
+    $ catfish plugin
+
 ### Getting help
 
     $ catfish help
@@ -57,7 +67,7 @@ And you can even run the provisioning in parallel
 ## TODO
 
 - Puppet provisioner support
-- Vagrant plugin support in Catfishfile
+- Add some spec tests
 
 ## Contributing
 

data/Rakefile

@@ -2,6 +2,9 @@ require 'bundler/gem_tasks'
 require 'rubocop/rake_task'
 require 'rake/clean'
 
-CLEAN.include('Catfishfile', 'Catfishfile.lock', 'Vagrantfile')
+CLEAN.include('Catfishfile', 'Catfishfile.lock', 'Vagrantfile', 'modules',
+  'Puppetfile*', 'manifests', 'hiera.yaml', 'hiera')
 
 RuboCop::RakeTask.new
+
+task default: :install

data/lib/catfish/cli.rb

@@ -5,15 +5,6 @@ module Catfish
   class CLI < Thor
     include Thor::Actions
 
-    #		def self.start(*)
-    #			super
-    #		rescue Exception => e
-    #			Bundler.ui = UI::Shell.new
-    #			raise e
-    #		ensure
-    #			Bundler.cleanup
-    #		end
-
     def initialize(*args)
       super
     rescue UnknownArgumentError => e
@@ -32,11 +23,17 @@ module Catfish
     D
     method_option 'provisioners', type: :array, banner: 'A list of vagrant provisiners to use'
     method_option 'communicator', type: :string, banner: 'The communicator. ssh (default) or winrm'
+    method_option 'windows', type: :boolean, banner: 'Shorthand for --communicator=winrm'
     method_option 'winrm-username', type: :string, banner: 'Username for winrm. Used with --communicator=winrm'
     method_option 'winrm-password', type: :string, banner: 'Password for winrm. Used with --communicator=winrm'
+    method_option 'shell', type: :boolean, banner: 'Shorthand for provisioners=shell'
     method_option 'shell-paths', type: :array, banner: 'A list of paths to use if shell provisioning is selected'
     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 'puppet', type: :boolean, banner: 'Shorthand for provisioners=puppet'
+    method_option 'puppet-librarian-puppet', type: :boolean, default: 'true',
+                  banner: 'Whether or not to include a default Puppetfile and librarian puppet plugin'
+    method_option 'puppet-hiera', type: :boolean, default: 'true', banner: 'Include hiera templates. Only applies to puppet provisioner'
     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

data/lib/catfish/cli/init.rb

@@ -1,3 +1,5 @@
+require 'pp'
+
 module Catfish
   class CLI
     class Init
@@ -11,30 +13,50 @@ module Catfish
       def run
         p 'Initializing Catfish repository'
 
-        templates = {
-          'Catfishfile.tt' => 'Catfishfile',
-          'Vagrantfile.tt' => 'Vagrantfile'
-        }
+        provisioners = options[:provisioners] || []
+        plugins = options[:plugins] || []
+
+        # Shorthand aliases
+        options[:communicator] = 'winrm' if options[:windows]
+        provisioners << 'shell' if options[:shell]
+        provisioners << 'puppet' if options[:puppet]
+        plugins << 'vagrant-librarian-puppet' if options['puppet-librarian-puppet']
 
         opts = {
-          provisioners: options[:provisioners]      || [],
+          provisioners: provisioners                || [],
           shell_paths: options['shell-paths']       || ['{{PATH_TO_YOUR_SCRIPT}}'],
+          puppet_hiera: options['puppet-hiera'],
+          puppet_librarian_puppet: options['puppet-librarian-puppet'],
           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_private_key_path: options['ssh-private-key-path'] || '{{PATH_TO_YOUR_SSH_PRIVATE_KEY}}',
           servers: options['servers']               || [],
-          plugins: options['plugins']               || []
+          plugins: plugins                          || []
+        }
+
+        templates = {
+          'Catfishfile.tt' => 'Catfishfile',
+          'Vagrantfile.tt' => 'Vagrantfile'
         }
 
+        if provisioners.include? 'puppet'
+          templates.merge!('puppet/manifests/default.pp.tt' => 'manifests/default.pp')
+          templates.merge!('puppet/Puppetfile.tt' => 'Puppetfile') if options['puppet-librarian-puppet']
+
+          if options['puppet-hiera']
+            templates.merge!('puppet/hiera.yaml.tt' => 'hiera.yaml')
+            templates.merge!('puppet/hiera/common.yaml.tt' => 'hiera/common.yaml')
+          end
+        end
+
         templates.each do |src, dst|
           thor.template(src, dst, opts)
         end
-        p 'Repository initialized. Remember to:'
-        p ' - Check your Vagrantfile and replace any placeholders'
-        p ' - Edit your Catfish file and list target servers'
-        p ' - Run catfish resolve'
+        puts 'Repository initialized. Remember to:'
+        puts ' - Check your Vagrantfile and replace any placeholders'
+        puts ' - Edit your Catfish file and list target servers'
       end
     end
   end

data/lib/catfish/cli/provision.rb

@@ -19,7 +19,7 @@ module Catfish
           abort 'ERROR DEPLOYING: One or more servers could not be connected to'
         end
 
-        provision
+        provision status
 
       ensure
 
@@ -36,7 +36,7 @@ module Catfish
       fail "#{vagrant_version} or greater is a prerequisite" unless `vagrant --version`.include? vagrant_version
     end
 
-    def provision
+    def provision(status)
       if options[:parallel]
         machines = status.split("\n").collect do |line|
           line.split(',')[1]

data/lib/catfish/templates/Vagrantfile.tt

@@ -4,12 +4,20 @@
 Vagrant.configure("2") do |config|
 
   config.vm.box = "tknerr/managed-server-dummy"
-<% config[:provisioners].each do |provisioner| -%>
-<% if provisioner == 'shell' -%>
+<% if config[:provisioners].include? 'shell' -%>
 <% config[:shell_paths].each do |path| -%>
   config.vm.provision 'shell', path: '<%= path %>'
 <% end -%>
 <% end -%>
+<% if config[:provisioners].include? 'puppet' -%>
+  config.vm.provision 'puppet' do |puppet|
+<% if config[:puppet_hiera] -%>
+    puppet.hiera_config_path = 'hiera.yaml'
+<% end -%>
+<% if config[:puppet_librarian_puppet] -%>
+    puppet.module_path = 'modules'
+<% end -%>
+  end
 <% end -%>
 <% if config[:communicator] == 'winrm' -%>
   config.vm.communicator = '<%= config[:communicator] %>'

data/lib/catfish/templates/puppet/Puppetfile.tt

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+#^syntax detection
+
+forge "https://forgeapi.puppetlabs.com"
+
+# A module from the Puppet Forge
+# mod 'puppetlabs/stdlib'

data/lib/catfish/templates/puppet/hiera.yaml.tt

@@ -0,0 +1,10 @@
+---
+:backends:
+  - yaml
+
+:hierarchy:
+# - "node/%{::fqdn}"
+  - "common"
+
+:yaml:
+  :datadir: '/vagrant/hiera'

data/lib/catfish/templates/puppet/hiera/common.yaml.tt

@@ -0,0 +1,2 @@
+---
+the_name: "Joey Joe Joe Junior Shabadoo"

data/lib/catfish/templates/puppet/manifests/default.pp.tt

@@ -0,0 +1,3 @@
+# Your puppet code goes here.
+$the_name = hiera('the_name', 'World')
+notify { "Hello, ${the_name}. ":}

data/lib/catfish/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: catfish
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Christopher Baldauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,6 +76,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rubocop.yml
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -91,6 +92,10 @@ files:
 - lib/catfish/dsl.rb
 - lib/catfish/templates/Catfishfile.tt
 - lib/catfish/templates/Vagrantfile.tt
+- lib/catfish/templates/puppet/Puppetfile.tt
+- lib/catfish/templates/puppet/hiera.yaml.tt
+- lib/catfish/templates/puppet/hiera/common.yaml.tt
+- lib/catfish/templates/puppet/manifests/default.pp.tt
 - lib/catfish/version.rb
 homepage: https://github.com/chrisbaldauf/catfish
 licenses: