unidad 0.0.1.beta2 → 0.0.1.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a8d6bb8bfb697da6937982cf1b572c55dd23b13
-  data.tar.gz: 74cf84eea25316cb288b6fc68168f7927f08410d
+  metadata.gz: 08d1f8141269514c7d44d53b5d768e48849a210d
+  data.tar.gz: 52d48d7e06b198cc661c510f732c000922c3ef38
 SHA512:
-  metadata.gz: 32f1404897c68c1a15e1c0f0c97091786d584be707f4be3cd1dc13d1e7f9f3579633bde1706608b493937b6c9dfdb96531aa9e5091c2eff0662b4e6336dbcbdb
-  data.tar.gz: cb4819b82900e6dadfe5e175bf1c5f5eda68bbaeab8c2c7cabefda933db208b42796869f93fee3f5fd882616da7f6f221603a8fea44ed4dfd9c5dbd848fbff72
+  metadata.gz: 35b482f34d7b6fa81e28124a256d6552c098692a1097eb55d38f38640cf2a0ad4ad5f4f4b03fd2b93e8050a5e56ff9247f54ecbbffab85e330100da61d75c0dd
+  data.tar.gz: faf792535c4603546078ac6841d720635c353f98714c50d296c55ae391d7f563e301d6e56e52c521a1b8438c55d5cc44f88ce0dba753b6f8833583a7a329847d

data/.rubocop.yml

@@ -1,6 +1,7 @@
 AllCops:
   RunRailsCops: false
   Exclude:
+    - lib/util/match_method_macros.rb
     - spec/test_app/**
     - bin/**
 

data/config/unidad.yml

@@ -21,3 +21,6 @@ unidad:
       failure: "*[ERROR]* *%{username}* failed to complete running playbook `%{playbook}` from `%{branch}` of `%{repository}`"
       options:
         <<: *default_options
+  galaxy:
+    commands:
+      - "ansible-galaxy install -r %{requirements_file}"

data/lib/unidad/cli/ansible/base.rb

@@ -0,0 +1,17 @@
+module Unidad
+  module Cli
+    module Ansible
+      class Base < Unidad::Cli::NamespacedGroup
+        class_option :ansible_path,   :default => 'ansible',
+                                      :type => :string,
+                                      :desc => 'The relative path to your ansible playbooks. (optional)'
+
+        private
+
+        def ansible_path
+          Unidad.root.join(options[:ansible_path])
+        end
+      end
+    end
+  end
+end

data/lib/unidad/cli/ansible/galaxy.rb

@@ -0,0 +1,17 @@
+module Unidad
+  module Cli
+    module Ansible
+      class Galaxy < Unidad::Cli::Ansible::Base
+        argument :requirements_file,  :desc => 'The YAML file containing requirements to install',
+                                      :type => :string,
+                                      :required => true
+
+        def run_galaxy
+          Unidad::CommandBuilder.all(:galaxy, :requirements_file => ansible_path.join(requirements_file)).each do |command|
+            say_status :run, command
+          end
+        end
+      end
+    end
+  end
+end

data/lib/unidad/cli/ansible/playbook.rb

@@ -1,9 +1,7 @@
 module Unidad
   module Cli
     module Ansible
-      class Playbook < Thor::Group
-        include Thor::Actions
-
+      class Playbook < Unidad::Cli::Ansible::Base
         argument :hosts_file,  :desc => 'The hosts file to use when running the playbook',
                                :type => :string,
                                :required => true
@@ -11,24 +9,18 @@ module Unidad
                                :type => :string,
                                :required => true
 
-        class_option :ansible_path,   :default => 'ansible',
-                                      :type => :string,
-                                      :desc => 'The path to your ansible playbooks. (optional, defaults to ./ansible)',
-                                      :banner => '--ansible_path my_playbooks'
-
         class_option :vault_password, :type => :string,
-                                      :desc => 'The Ansible vault password required to run your playbook. (optional)',
-                                      :banner => '--vault_password S3CR3T!!!'
+                                      :desc => 'The Ansible vault password required to run your playbook. (optional)'
+
         def before
           messenger.on(:before)
         end
 
         def ask_for_vault_password
-          unless password_file_exists?
-            vault_password = options.fetch(:vault_password, ask('What is your Ansible vault password?', :echo => false))
-            puts
-            create_file password_file_path, vault_password
-          end
+          return if password_file_exists?
+          vault_password = options.fetch(:vault_password, ask('What is your Ansible vault password?', :echo => false))
+          puts
+          create_file password_file_path, vault_password
         end
 
         def run_playbook
@@ -57,11 +49,7 @@ module Unidad
         end
 
         def password_file_exists?
-          File.exists?(password_file_path)
-        end
-
-        def ansible_path
-          Unidad.root.join(options[:ansible_path])
+          File.exist?(password_file_path)
         end
 
         def command_options

data/lib/unidad/cli/namespaced_group.rb

@@ -0,0 +1,13 @@
+module Unidad
+  module Cli
+    class NamespacedGroup < Thor::Group
+      include Thor::Actions
+
+      # The banner for this class. You can customize it if you are invoking the
+      # thor class by another ways which is not the Thor::Runner.
+      def self.banner
+        "#{basename} #{name.split('::').last.downcase} #{arguments.collect(&:usage).compact.join(' ')}"
+      end
+    end
+  end
+end

data/lib/unidad/cli/root.rb

@@ -4,14 +4,18 @@ require 'thor/group'
 
 Dotenv.load
 
+require 'unidad/cli/namespaced_group'
 require 'unidad/cli/deploy'
+require 'unidad/cli/ansible/base'
 require 'unidad/cli/ansible/playbook'
+require 'unidad/cli/ansible/galaxy'
 
 module Unidad
   module Cli
     class Root < Thor
       register Unidad::Cli::Deploy, 'deploy', 'deploy [ENVIRONMENT]', 'Deploy your application to the specified environment.'
       register Unidad::Cli::Ansible::Playbook, 'playbook', 'playbook [HOSTS_FILE] [PLAYBOOK]', 'Run an Ansible playbook.'
+      register Unidad::Cli::Ansible::Galaxy, 'galaxy', 'galaxy [REQUIREMENTS_FILE]', 'Install Ansible dependencies via Galaxy.'
     end
   end
 end

data/lib/unidad/messenger.rb

@@ -10,7 +10,7 @@ module Unidad
 
     match_method(/\A(.*)=/) do |name, *args|
       option = name.to_s.gsub('=', '').to_sym
-      self.options[option] = args[0]
+      options[option] = args[0]
     end
 
     def initialize(command)

data/lib/unidad/version.rb

@@ -1,3 +1,3 @@
 module Unidad
-  VERSION = '0.0.1.beta2'
+  VERSION = '0.0.1.beta3'
 end

data/lib/util/match_method_macros.rb

@@ -1,3 +1,5 @@
+# Credit: Avdi Grimm
+# https://gist.github.com/avdi/1440084
 module MatchMethodMacros
   def match_method(matcher, &method_body)
     mod = Module.new do
@@ -18,4 +20,4 @@ module MatchMethodMacros
     end
     include mod
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unidad
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta2
+  version: 0.0.1.beta3
 platform: ruby
 authors:
 - PJ Kelly
@@ -215,8 +215,11 @@ files:
 - config/unidad.yml
 - lib/unidad.rb
 - lib/unidad/cli.rb
+- lib/unidad/cli/ansible/base.rb
+- lib/unidad/cli/ansible/galaxy.rb
 - lib/unidad/cli/ansible/playbook.rb
 - lib/unidad/cli/deploy.rb
+- lib/unidad/cli/namespaced_group.rb
 - lib/unidad/cli/root.rb
 - lib/unidad/command_builder.rb
 - lib/unidad/messenger.rb