kaigara 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cab61ce6c23bcb33686b23d28dd84be586751269
-  data.tar.gz: 8e0d5fdb695244be85af5e5f5ec3d43a4512fb7d
+  metadata.gz: 5f61a93c89d4acea9db654743edc918fac14d447
+  data.tar.gz: 89247b9ac7f03dd1c0e4f12afc2b5cdb82e54a63
 SHA512:
-  metadata.gz: 6eaaec1a9342bbd83ff09e4415624ba6c632b77dc512c247799e710859cf7fabb3a31c75e10dfb884a45dd118028e66f8a31b30ef6be2c7b6e4cb40b2d04a6f3
-  data.tar.gz: d9095141fe48d5fba4b74a10653a1902c7a3a706754aa7657c546ff634b5892ac7462f60c60e5c59f0c11c66184c23d45e026608684a9d2e2a650181975e2d68
+  metadata.gz: c2b560e4a98687e8de3c03e3c237d77b262acef14f3028049801f01b65344a3c71d6368ba46f81b2285c43be4ec60bd5b84104d6debb7ac9f1d114379b8075cf
+  data.tar.gz: 43f09bacbe74743538c722e50cc7f3174a4933fdc9bdb4a865dc3dae4f0d8a017c6a8695afe6cc165dad6e214a33108c3d0113b2e062435d136fbec748084244

data/app/models/sysops/operation.rb

@@ -1,4 +1,5 @@
 require 'open3'
+require 'kaigara/dsl'
 
 module Kaigara
 
@@ -6,6 +7,7 @@ module Kaigara
   # A script that +Sysops+ executes
   #
   class Operation
+    include Kaigara::DSL
 
     #
     # A proxy class for Thor
@@ -24,8 +26,7 @@ module Kaigara
       @shell = ThorShell.new
       @name = File.basename(path)
       @content = File.read(path)
-      Environment.load_variables(self)   # We loads variables to both shell and operation classes.
-      Environment.load_variables(@shell) # So it's available from your ruby code in +operations/+ and from our DSL.
+      Environment.load_variables(self)   # We loads variables to both shell and operation classes. So it's available from your ruby code in +operations/+ and from our DSL.
     end
 
     # Executes operation content
@@ -33,142 +34,6 @@ module Kaigara
       @shell.say "Applying #{@name}\n--------------------", :yellow
       instance_eval @content
     end
-
-    # One of the most important parts of DSL. You can use it directly in your operations.
-    def execute(cmd)
-      @shell.say "Running: #{cmd}", :yellow
-      stdin, stdout, stderr, wait_thr = Open3.popen3({}, "bash -e")
-      stdin.puts(cmd)
-      Thread.new do
-        stdout.each { |l| @shell.say(l, :green) }
-      end
-      Thread.new do
-        stderr.each { |l| @shell.say(l, :red) }
-      end
-      stdin.close
-
-      exit_status = wait_thr.value.exitstatus
-      if exit_status != 0
-        raise "Command `#{ cmd }` returned status code #{ exit_status }"
-      end
-    end
-
-    #
-    # Return true if the `file` exists? and the content matches the `match`
-    # If a block is given it's executed if the statement is true
-    #
-    def file_matches?(file, match)
-      if File.exists?(file)
-        if File.read(file).match(match)
-          yield if block_given?
-          return true
-        end
-      end
-      false
-    end
-
-    #
-    # Return true if the OS is Ubuntu or Debian
-    # If a block is given it's executed if the statement is true
-    #
-    def debian_family?
-      file_matches?("/etc/issue", /Ubuntu|Debian/i) do
-        yield if block_given?
-      end
-    end
-
-    #
-    # Return true if the OS is CentOS or RedHat
-    # If a block is given it's executed if the statement is true
-    #
-    def redhat_family?
-      file_matches?("/etc/redhat-release", /CentOS|Red Hat/i) do
-        yield if block_given?
-      end
-    end
-
-    #
-    # Add common additional repositories
-    #
-    def repo_extended
-      redhat_family? do
-        package("epel-release")
-        package_update
-      end
-    end
-
-    #
-    # Update the local repository cache
-    #
-    def package_update
-      if debian_family?
-        execute("apt-get update")
-      elsif redhat_family?
-        execute("yum update")
-      end
-    end
-
-    #
-    # Install the package depending on OS
-    #
-    def package(name, version = nil)
-      if debian_family?
-        execute("apt-get install -y #{ name }")
-      elsif redhat_family?
-        execute("yum install -y #{ name }")
-      else
-        raise "OS not supported"
-      end
-    end
-
-    #
-    # Creates a file with the specified content
-    #
-    def file(filepath, content, opts = {overwrite: true})
-      if !opts[:overwrite] and File.exists?(filepath)
-        raise "File #{filepath} exists"
-      end
-
-      File.open(filepath, "w") do |fd|
-        fd.write(content)
-      end
-    end
-
-    #
-    # Configure the hostname of the machine
-    #
-    def hostname(hostname)
-      file("/etc/hostname", hostname)
-    end
-
-    #
-    # Templates ERB template. You can use variables from metadata.rb in your templates.
-    # <tt>name</tt> - template name, without '.erb'
-    # <tt>-p</tt> - destination file. If you don't use it, the file renders to +/path-in-resources/+
-    #
-    def template(name, target = nil)
-      tpl_file = name + '.erb'
-      destination = target
-      destination = "/#{tpl_file}" if destination.nil?
-      destination.gsub!(/\.erb$/,'')
-
-      @shell.say "Rendering template #{tpl_file} to #{destination}", :yellow
-      ThorShell.source_root(File.join(@work_dir, 'resources'))
-      @shell.template(tpl_file, destination)
-
-      return destination
-    end
-
-    #
-    # Renders a template, then executes the script.
-    # You should add shebang to your script.
-    #
-    def script(name, path = nil)
-      target = template(name, File.join( (path.nil? ? "" : path), name))
-      @shell.chmod(target, 0755)
-      target.prepend('./') unless target.match(/^\//)
-      execute("#{target}")
-    end
   end
 end
 

data/app/models/sysops/package.rb

@@ -50,7 +50,7 @@ module Kaigara
 
     # Execute operations in the operations directory one by one
     def run!(operations)
-      Dir[File.join(@operations_dir, '*.rb')].each do |x|
+      Dir[File.join(@operations_dir, '*.rb')].sort.each do |x|
         if operations.empty? or operations.find { |op| x.include?(op) }
           execute_operation!(x)
         end

data/lib/kaigara/dsl.rb

@@ -0,0 +1,151 @@
+module Kaigara
+  module DSL
+    include Thor::Base
+    include Thor::Actions
+    include Thor::Shell
+
+    def self.included(receiver)
+      receiver.send :include, Thor::Actions
+      receiver.send :include, Thor::Base
+      receiver.send :include, Thor::Shell
+    end
+
+    # One of the most important parts of DSL. You can use it directly in your operations.
+    def execute(cmd)
+      Environment.load_variables(self)
+      say "Running: #{cmd}", :yellow
+      stdin, stdout, stderr, wait_thr = Open3.popen3({}, "bash -e")
+      stdin.puts(cmd)
+      Thread.new do
+        stdout.each { |l| say(l, :green) }
+      end
+      Thread.new do
+        stderr.each { |l| say(l, :red) }
+      end
+      stdin.close
+
+      exit_status = wait_thr.value.exitstatus
+      if exit_status != 0
+        raise "Command `#{ cmd }` returned status code #{ exit_status }"
+      end
+    end
+
+    #
+    # Templates ERB template. You can use variables from metadata.rb in your templates.
+    # <tt>name</tt> - template name, without '.erb'
+    # <tt>-p</tt> - destination file. If you don't use it, the file renders to +/path-in-resources/+
+    #
+    def template(source, target)
+      Environment.load_variables(self)
+      tpl_file = 'resources/' + source + '.erb'
+      destination = target
+      destination = "/#{tpl_file}" if destination.nil?
+      destination.gsub!(/\.erb$/,'')
+      context = instance_eval("binding")
+
+      say "Rendering template #{tpl_file} to #{destination}", :yellow
+      File.write(destination, ERB.new(File.read(tpl_file), nil, "-", "@output_buffer").result(context))
+
+      return destination
+    end
+
+    #
+    # Renders a template, then executes the script.
+    # You should add shebang to your script.
+    #
+    def script(name, path = nil)
+      target = template(name, File.join( (path.nil? ? "" : path), name))
+      File.chmod(0755, target)
+      target.prepend('./') unless target.match(/^\//)
+      execute("#{target}")
+    end
+
+    #
+    # Return true if the `file` exists? and the content matches the `match`
+    # If a block is given it's executed if the statement is true
+    #
+    def file_matches?(file, match)
+      if File.exists?(file)
+        if File.read(file).match(match)
+          yield if block_given?
+          return true
+        end
+      end
+      false
+    end
+
+    #
+    # Return true if the OS is Ubuntu or Debian
+    # If a block is given it's executed if the statement is true
+    #
+    def debian_family?
+      file_matches?("/etc/issue", /Ubuntu|Debian/i) do
+        yield if block_given?
+      end
+    end
+
+    #
+    # Return true if the OS is CentOS or RedHat
+    # If a block is given it's executed if the statement is true
+    #
+    def redhat_family?
+      file_matches?("/etc/redhat-release", /CentOS|Red Hat/i) do
+        yield if block_given?
+      end
+    end
+
+    #
+    # Add common additional repositories
+    #
+    def repo_extended
+      redhat_family? do
+        package("epel-release")
+        package_update
+      end
+    end
+
+    #
+    # Update the local repository cache
+    #
+    def package_update
+      if debian_family?
+        execute("apt-get update")
+      elsif redhat_family?
+        execute("yum update -y")
+      end
+    end
+
+    #
+    # Install the package depending on OS
+    #
+    def package(name, version = nil)
+      if debian_family?
+        execute("apt-get install -y #{ name }")
+      elsif redhat_family?
+        execute("yum install -y #{ name }")
+      else
+        raise "OS not supported"
+      end
+    end
+
+    #
+    # Creates a file with the specified content
+    #
+    def file(filepath, content, opts = {overwrite: true})
+      if !opts[:overwrite] and File.exists?(filepath)
+        raise "File #{filepath} exists"
+      end
+
+      File.open(filepath, "w") do |fd|
+        fd.write(content)
+      end
+    end
+
+    #
+    # Configure the hostname of the machine
+    #
+    def hostname(hostname)
+      file("/etc/hostname", hostname)
+    end
+  end
+end

data/lib/kaigara/version.rb

@@ -1,4 +1,4 @@
 module Kaigara
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaigara
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Helios Technologies
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -116,6 +116,7 @@ files:
 - lib/kaigara/base_controller.rb
 - lib/kaigara/client.rb
 - lib/kaigara/deephash.rb
+- lib/kaigara/dsl.rb
 - lib/kaigara/metadata.rb
 - lib/kaigara/version.rb
 homepage: https://github.com/helios-technologies/kaigara