ansible-ruby 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 726f48de14e28ee9631e4c8704701a535a3131ae
-  data.tar.gz: 436a55d8dedd8638b003db3b2fb43e2607a193ac
+  metadata.gz: 0b7dc314111b76ada2715f1dc9619d2f8f087dc4
+  data.tar.gz: 1a1063f74eef0b00698eb35b2018df427863be4d
 SHA512:
-  metadata.gz: d4b793d6abafddba8d48fafee445e5b2c598285915ba168417eccbf3e248d0da2613088f76b677a5fd88788a1b00701bb451379c4cbe3ac8f9d78ef99e80f330
-  data.tar.gz: 0f657b0bbd6855399efece357a0d4516ebcc52cca63c6f7229a25d86b7bb3282e70ac5eaea8123fac971a14215686b0ea02ee6e009ea40f9d275feec9b2a8778
+  metadata.gz: 7db7a733456eaf690c3cef12d995bcde355eb81b88dcb9043fd2bb72746a28538753382219b47e2eab2c3ad2f39c30bfb09c9127aa376b304c8b076e2565fc89
+  data.tar.gz: d5f63ff327a8e9f88771f2e63989594f755d0c8650afe4d21ab7db4466cfdb8d3e8e96687885545081f713228cf7f83766c2bcc7514e9bb63df65a33c273e4c2

data/lib/ansible-ruby.rb

@@ -3,5 +3,5 @@
 require 'ansible/ruby/version'
 require 'ansible/ruby/serializer'
 require 'ansible/ruby/dsl_builders/file_level'
-require 'ansible/ruby/modules/generated'
+require 'ansible/ruby/modules/all'
 # rubocop:enable Style/FileName

data/lib/ansible/ruby/dsl_builders/args.rb

@@ -9,7 +9,7 @@ module Ansible
           @result = {}
         end
 
-        def process_method(id, *args)
+        def _process_method(id, *args)
           value = args.length == 1 ? args[0] : args
           @result[id] = value
         end

data/lib/ansible/ruby/dsl_builders/base.rb

@@ -8,7 +8,7 @@ module Ansible
 
         attr_reader :result
 
-        def evaluate(*args, &block)
+        def _evaluate(*args, &block)
           if block
             instance_eval(&block)
           else
@@ -24,7 +24,7 @@ module Ansible
 
         def method_missing(id, *args, &block)
           result = begin
-            process_method id, *args, &block
+            _process_method id, *args, &block
           rescue StandardError => our_error
             begin
               super
@@ -45,7 +45,7 @@ module Ansible
           nil
         end
 
-        def implicit_bool(args)
+        def _implicit_bool(args)
           args.empty? || args[0]
         end
       end

data/lib/ansible/ruby/dsl_builders/file_level.rb

@@ -18,7 +18,7 @@ module Ansible
           end
           @context = :playbook
           play_builder = Play.new name
-          @plays << play_builder.evaluate(&block)
+          @plays << play_builder._evaluate(&block)
         end
 
         def task(name, &block)
@@ -30,20 +30,20 @@ module Ansible
           @tasks_builder.task name, &block
         end
 
-        def evaluate(*)
+        def _evaluate(*)
           super
           case @context
           when :playbook
             # TODO: Add a playbook DSL and do this like tasks
             Models::Playbook.new plays: @plays
           when :tasks
-            @tasks_builder.evaluate {}
+            @tasks_builder._evaluate {}
           else
             raise "Unknown context #{@context}"
           end
         end
 
-        def process_method(id, *)
+        def _process_method(id, *)
           raise "undefined local variable or method `#{id}'"
         end
       end

data/lib/ansible/ruby/dsl_builders/module_call.rb

@@ -10,33 +10,51 @@ module Ansible
         MODULES_MOD = Ansible::Ruby::Modules
 
         def respond_to_missing?(method_name, _)
-          klass_name = klass_name method_name
+          klass_name = _klass_name method_name
           MODULES_MOD.const_defined?(klass_name) || super
         end
 
         private
 
-        def klass_name(id)
+        def _klass_name(id)
           id.to_s.capitalize
         end
 
-        def process_method(id, *module_args, &block)
-          raise "Unknown module #{id}" unless respond_to_missing? id, true
-          module_klass = MODULES_MOD.const_get klass_name(id)
+        def _process_method(id, *module_args, &block)
+          module_klass = _module_klass(id)
+          args = _arguments(block, module_args, module_klass)
+          @result = module_klass.new(args)
+          @result.validate!
+        end
+
+        def _arguments(block, module_args, module_klass)
           free_form_module = module_klass.include?(Ansible::Ruby::Modules::FreeForm)
           if module_args.any? && !free_form_module
             raise "Can't use arguments #{module_args} on this type of module"
           end
-          free_form = free_form_arg(module_args) if free_form_module
+          if !free_form_module && !block
+            raise 'You must supply a block when using this type of module'
+          end
+          args = {}
+          free_form = free_form_module && _free_form_arg(module_args)
+          args.merge! _block_args(&block)
+          args[:free_form] = free_form if free_form
+          args
+        end
+
+        def _module_klass(id)
+          raise "Unknown module #{id}" unless respond_to_missing? id, true
+          MODULES_MOD.const_get _klass_name(id)
+        end
+
+        def _block_args(&block)
+          return {} unless block
           # Delegate everything to the args builder and apply it to the module class we located
           module_builder = Args.new
-          args = module_builder.evaluate(&block)
-          args[:free_form] = free_form if free_form
-          @result = module_klass.new(args)
-          @result.validate!
+          module_builder._evaluate(&block)
         end
 
-        def free_form_arg(module_args)
+        def _free_form_arg(module_args)
           if module_args.any?
             raise 'Expected only 1 argument for this type of module' if module_args.length > 1
             module_args[0]

data/lib/ansible/ruby/dsl_builders/play.rb

@@ -40,7 +40,7 @@ module Ansible
           connection :local
         end
 
-        def evaluate(*)
+        def _evaluate(*)
           tasks = super
           args = @playbook_args.merge({})
           # Don't want to trigger validation

data/lib/ansible/ruby/dsl_builders/task.rb

@@ -15,7 +15,7 @@ module Ansible
           @task_args = {}
         end
 
-        def evaluate(*)
+        def _evaluate(*)
           super
           args = {
             module: @module,
@@ -27,7 +27,7 @@ module Ansible
         end
 
         def become(*args)
-          value = implicit_bool args
+          value = _implicit_bool args
           @task_args[:become] = value
         end
 
@@ -64,7 +64,7 @@ module Ansible
         end
 
         def ignore_errors(*args)
-          value = implicit_bool args
+          value = _implicit_bool args
           @task_args[:ignore_errors] = value
         end
 
@@ -74,7 +74,7 @@ module Ansible
 
         private
 
-        def process_method(id, *args, &block)
+        def _process_method(id, *args, &block)
           # only 1 module, so don't try and do this again
           raise "undefined local variable or method `#{id}'" if @module
           module_call_builder = ModuleCall.new

data/lib/ansible/ruby/dsl_builders/tasks.rb

@@ -11,15 +11,15 @@ module Ansible
 
         def task(name, &block)
           task_builder = Task.new name
-          @tasks << task_builder.evaluate(&block)
+          @tasks << task_builder._evaluate(&block)
         end
 
-        def evaluate(*)
+        def _evaluate(*)
           super
           Models::Tasks.new tasks: @tasks
         end
 
-        def process_method(id, *)
+        def _process_method(id, *)
           raise "undefined local variable or method `#{id}'"
         end
       end

data/lib/ansible/ruby/modules/custom/free_form.rb

@@ -22,10 +22,11 @@ module Ansible
           module_key = result.keys[0]
           args = result[module_key]
           free_form_arg = args.delete :free_form
-          {
-            module_key => free_form_arg,
-            args: args
+          result = {
+            module_key => free_form_arg
           }
+          result[:args] = args if args.any?
+          result
         end
       end
     end

data/lib/ansible/ruby/rake/clean.rb

@@ -0,0 +1,33 @@
+# See LICENSE.txt in root of repository
+
+require 'rake/tasklib'
+require 'ansible/ruby/rake/task_util'
+
+module Ansible
+  module Ruby
+    module Rake
+      class Clean < ::Rake::TaskLib
+        include TaskUtil
+
+        # :reek:Attribute - Rake DSL gets ugly if we don't use a block
+        attr_accessor :files
+
+        def initialize(parameters = :default)
+          name, deps = parse_params parameters
+          yield self if block_given?
+          raise 'You did not supply any files!' unless files && [*files].any?
+          clean_files = yaml_filenames [*files]
+          task name => deps do
+            exist = clean_files.select { |file| File.exist? file }
+            if exist.any?
+              puts 'Cleaning ansible-ruby files'
+              rm_rf exist
+            else
+              puts 'No ansible-ruby files exist to clean'
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ansible/ruby/rake/compile.rb

@@ -0,0 +1,43 @@
+# See LICENSE.txt in root of repository
+require 'rake/tasklib'
+require 'ansible-ruby'
+require 'ansible/ruby/rake/task_util'
+
+module Ansible
+  module Ruby
+    module Rake
+      class Compile < ::Rake::TaskLib
+        include TaskUtil
+
+        # :reek:Attribute - Rake DSL gets ugly if we don't use a block
+        attr_accessor :files
+
+        def initialize(parameters = :default)
+          self.class.load_rule
+          name, deps = parse_params parameters
+          yield self if block_given?
+          raise 'You did not supply any files!' unless files && [*files].any?
+          deps ||= []
+          yml_filenames = yaml_filenames([*files])
+          deps = [*deps] + yml_filenames
+          task name => deps
+        end
+
+        class << self
+          def load_rule
+            return if @rule_done
+            ::Rake.application.create_rule '.yml' => '.rb' do |filename|
+              puts "Updating Ansible file #{filename.name} from #{filename.source}..."
+              ruby = File.read filename.source
+              playbook_builder = Ansible::Ruby::DslBuilders::FileLevel.new
+              playbook = playbook_builder._evaluate ruby
+              yml = Ansible::Ruby::Serializer.serialize playbook.to_h
+              File.write filename.name, yml
+            end
+            @rule_done = true
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ansible/ruby/rake/execute.rb

@@ -0,0 +1,60 @@
+require 'rake/tasklib'
+require 'ansible-ruby'
+require 'ansible/ruby/rake/task_util'
+require 'ansible/ruby/rake/compile'
+require 'ansible/ruby/rake/clean'
+
+module Ansible
+  module Ruby
+    module Rake
+      class Execute < ::Rake::TaskLib
+        include TaskUtil
+
+        # :reek:Attribute - Rake DSL gets ugly if we don't use a block
+        attr_accessor :playbooks
+        # :reek:Attribute - Rake DSL gets ugly if we don't use a block
+        attr_accessor :options
+
+        def initialize(parameters = :default)
+          name, deps = parse_params parameters
+          yield self if block_given?
+          raise 'You did not supply any playbooks!' unless playbooks.any?
+          deps ||= []
+          compile_task_name = "#{name}_compile".to_sym
+          deps = [*deps] << compile_task_name
+          playbook_yml_files = yaml_filenames playbooks
+          task name => deps do
+            flat = flat_options
+            flat += ' ' unless flat.empty?
+            sh "ansible-playbook #{flat}#{playbook_yml_files.join ' '}"
+          end
+          symbol = name.inspect.to_s
+          desc "Compiles YAML files for #{symbol} task"
+          compiled_files = playbooks + role_task_files
+          Compile.new compile_task_name do |compile_task|
+            compile_task.files = compiled_files
+          end
+          desc "Cleans YAML files for #{symbol} task"
+          Clean.new "#{name}_clean".to_sym do |clean_task|
+            clean_task.files = compiled_files
+          end
+        end
+
+        private
+
+        def playbooks
+          [*@playbooks]
+        end
+
+        def role_task_files
+          FileList['roles/*/tasks/**/*.rb']
+        end
+
+        def flat_options
+          array = [*options] << ENV['ANSIBLE_OPTS']
+          array.compact.join ' '
+        end
+      end
+    end
+  end
+end

data/lib/ansible/ruby/rake/task_util.rb

@@ -0,0 +1,25 @@
+# See LICENSE.txt for license
+module Ansible
+  module Ruby
+    module Rake
+      module TaskUtil
+        def yaml_filenames(ruby_files)
+          ruby_files.map { |file| file.sub(/\.[^.]+\z/, '.yml') }
+        end
+
+        def parse_params(parameters)
+          deps = nil
+          name = case parameters
+                 when Hash
+                   name = parameters.keys[0]
+                   deps = parameters[name]
+                   name
+                 else
+                   parameters
+                 end
+          [name, deps]
+        end
+      end
+    end
+  end
+end

data/lib/ansible/ruby/rake/tasks.rb

@@ -0,0 +1,2 @@
+require 'ansible/ruby/rake/compile'
+require 'ansible/ruby/rake/execute'

data/lib/ansible/ruby/version.rb

@@ -1,5 +1,5 @@
 module Ansible
   module Ruby
-    VERSION = '1.0.1'.freeze
+    VERSION = '1.0.2'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ansible-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Brady Wied
@@ -62,13 +62,13 @@ files:
 - lib/ansible/ruby/models/tasks.rb
 - lib/ansible/ruby/models/type_generic.rb
 - lib/ansible/ruby/models/type_validator.rb
+- lib/ansible/ruby/modules/all.rb
 - lib/ansible/ruby/modules/base.rb
 - lib/ansible/ruby/modules/custom/commands/command.rb
 - lib/ansible/ruby/modules/custom/commands/raw.rb
 - lib/ansible/ruby/modules/custom/commands/script.rb
 - lib/ansible/ruby/modules/custom/commands/shell.rb
 - lib/ansible/ruby/modules/custom/free_form.rb
-- lib/ansible/ruby/modules/generated.rb
 - lib/ansible/ruby/modules/generated/core/cloud/amazon/cloudformation.rb
 - lib/ansible/ruby/modules/generated/core/cloud/amazon/ec2.rb
 - lib/ansible/ruby/modules/generated/core/cloud/amazon/ec2_ami.rb
@@ -636,7 +636,11 @@ files:
 - lib/ansible/ruby/modules/generated/extras/windows/win_updates.rb
 - lib/ansible/ruby/modules/generated/extras/windows/win_uri.rb
 - lib/ansible/ruby/modules/generated/extras/windows/win_webpicmd.rb
-- lib/ansible/ruby/rake/task.rb
+- lib/ansible/ruby/rake/clean.rb
+- lib/ansible/ruby/rake/compile.rb
+- lib/ansible/ruby/rake/execute.rb
+- lib/ansible/ruby/rake/task_util.rb
+- lib/ansible/ruby/rake/tasks.rb
 - lib/ansible/ruby/serializer.rb
 - lib/ansible/ruby/version.rb
 homepage: https://github.com/wied03/ansible-ruby

data/lib/ansible/ruby/rake/task.rb

@@ -1,74 +0,0 @@
-require 'rake/tasklib'
-require 'ansible-ruby'
-
-module Ansible
-  module Ruby
-    module Rake
-      class Task < ::Rake::TaskLib
-        # :reek:Attribute - Rake DSL gets ugly if we don't use a block
-        attr_accessor :playbooks
-        # :reek:Attribute - Rake DSL gets ugly if we don't use a block
-        attr_accessor :options
-
-        def initialize(parameters = :default)
-          self.class.load_rule
-          name, deps = parse_params parameters
-          yield self if block_given?
-          raise 'You did not supply any playbooks!' unless playbooks && [*playbooks].any?
-          deps ||= []
-          playbook_yml_files = yaml_filenames([*playbooks])
-          role_task_yaml_files = yaml_filenames role_task_files
-          deps = [*deps] + (playbook_yml_files + role_task_yaml_files)
-          task name => deps do
-            flat = flat_options
-            flat += ' ' unless flat.empty?
-            sh "ansible-playbook #{flat}#{playbook_yml_files.join ' '}"
-          end
-        end
-
-        private
-
-        def flat_options
-          array = [*options] << ENV['ANSIBLE_OPTS']
-          array.compact.join ' '
-        end
-
-        class << self
-          def load_rule
-            return if @rule_done
-            ::Rake.application.create_rule '.yml' => '.rb' do |filename|
-              puts "Updating Ansible file #{filename.name} from #{filename.source}..."
-              ruby = File.read filename.source
-              playbook_builder = Ansible::Ruby::DslBuilders::FileLevel.new
-              playbook = playbook_builder.evaluate ruby
-              yml = Ansible::Ruby::Serializer.serialize playbook.to_h
-              File.write filename.name, yml
-            end
-            @rule_done = true
-          end
-        end
-
-        def yaml_filenames(ruby_files)
-          ruby_files.map { |file| file.sub(/\.[^.]+\z/, '.yml') }
-        end
-
-        def role_task_files
-          FileList['roles/*/tasks/**/*.rb']
-        end
-
-        def parse_params(parameters)
-          deps = nil
-          name = case parameters
-                 when Hash
-                   name = parameters.keys[0]
-                   deps = parameters[name]
-                   name
-                 else
-                   parameters
-                 end
-          [name, deps]
-        end
-      end
-    end
-  end
-end