kaigara 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a885b64939dc7a292636f93048a8a7039d75a04
-  data.tar.gz: ab2063b2bd2c2b7df81921806ee6c0645837fc28
+  metadata.gz: 8e0a7546c9c6a70c5d81bd6f4caa93af7fcb21d9
+  data.tar.gz: dabf75ee6daa3970a01581132710badf1ff27f11
 SHA512:
-  metadata.gz: a91108175bf25984d89b0c047242c0cf071f2dd7423d17847b0496c7999494301d7a33c62424d6b030e61be9b3cb610dfca1a26508542aabc25cb1366c86d11b
-  data.tar.gz: 10283b83233635d609b304d6ce01529895dc991f1d7e61490a436b70f58709c34db834cec5bd44f62743ca68075eb93cb0da28134cf87ed4a7831639aadbff11
+  metadata.gz: 136c3a11b6c01f2bc47392ac5e3d58159505c7c235be1eed28967fc0e33fd27c25e4442c53014d7beb33c69955a6c951d021a171f58c4de555149a68b855abca
+  data.tar.gz: 72794ea2047d69fd377ecfde7a00af314fc385a690db1c8faeae8661acc38d67c97878db677a9d87697b2abab9e46c53bc7f24db1a189ce2ce81ff1cd2be1548

data/README.md

@@ -22,9 +22,6 @@ Or install it yourself as:
 
 Basic commands are
 ```
-# Prepare ruby runtime on a remote host
-$> kaish remote bootstrap USER@SERVER
-
 # Creates a system operation package (sysops)
 $> kaish sysops create NAME
 
@@ -33,12 +30,6 @@ $> kaish sysops generate NAME
 
 # Execute all operations of the current working directory
 $> kaish sysops exec [DIRECTORY]
-
-# Install a kaigara sysops package from github or a private git repository
-$> kaish sysops install USER/NAME
-
-# list all kaigara sysops package located in ~/.kaigara/sysops
-$> kaish sysops list
 ```
 
 You can use `kaish help` any time to get help.

data/app/controllers/sysops.rb

@@ -1,5 +1,7 @@
 require 'models/sysops/package'
-require 'models/sysops/kaigara_package'
+require 'models/sysops/operation'
+require 'models/sysops/environment'
+require 'models/sysops/spec'
 
 module Kaigara
   class Sysops < BaseController
@@ -12,10 +14,6 @@ module Kaigara
       empty_directory(name)
       empty_directory(File.join(name, 'operations'))
       empty_directory(File.join(name, 'resources'))
-      #in_destination(name) do
-      #  render('metadata.rb')
-      #  render('Vagrantfile')
-      #end
       template('metadata.rb.erb', File.join(name, 'metadata.rb'))
       template('Vagrantfile.erb', File.join(name, 'Vagrantfile'))
     end
@@ -36,23 +34,5 @@ module Kaigara
       package.load!
       package.run!
     end
-
-    desc 'install <(github login)/(operation name)>', 'Install a kaigara operation'
-    def install(name)
-      pkg = KaigaraPackage.new(name)
-      begin
-        config = YAML.load_file(File.dirname(__FILE__) + '/../../kaigara.yml')
-        pkg.read_config! config
-      rescue Exception => ex
-        say("Failed to load node configuration! #{ex}", :red)
-      end
-
-      if pkg.is_installed?
-        say('The package is already installed', :green)
-      else
-        say("Installing #{name}...")
-        pkg.install()
-      end
-    end
   end
 end

data/app/models/sysops/environment.rb

@@ -1,14 +1,12 @@
 module Kaigara
   class Environment
-    attr_accessor :variables
-
-    def initialize
-      @variables = {}
-    end
-
-    def method_missing(method_sym, *arguments, &block)
-      @variables[method_sym.to_s] = arguments[0] rescue nil
+    def self.load_variables()
+      package = Package.new
+      @vars = package.load!
+      @vars.data.each_pair do |k, v|
+        Operation.send(:define_method, k.to_sym, Proc.new {v})
+        Operation::ThorShell.send(:define_method, k.to_sym, Proc.new {v})
+      end unless @vars.empty?
     end
   end
 end
-

data/app/models/sysops/{context.rb → operation.rb}

@@ -1,9 +1,8 @@
 require 'open3'
 
 module Kaigara
-  class Context
+  class Operation
     class ThorShell
-
       include Thor::Base
       include Thor::Actions
       include Thor::Shell
@@ -34,8 +33,9 @@ module Kaigara
     end
 
     def execute(cmd)
+      Environment.load_variables
       @shell.say "Running: #{cmd}", :yellow
-      stdin, stdout, stderr, wait_thr = Open3.popen3(@environment.variables, cmd)
+      stdin, stdout, stderr, wait_thr = Open3.popen3({}, cmd)
       @shell.say stdout.read(), :green
       @shell.say stderr.read(), :red
       stdin.close
@@ -47,15 +47,24 @@ module Kaigara
     end
 
     def template(name, target = nil)
+      Environment.load_variables
       tpl_file = name + '.erb'
       destination = target
       destination = "/#{tpl_file}" if destination.nil?
       destination.gsub!(/\.erb$/,'')
 
       @shell.say "Rendering template #{tpl_file} to #{destination}", :yellow
-      @shell.inject(@environment.variables)
       ThorShell.source_root(File.join(@work_dir, 'resources'))
       @shell.template(tpl_file, destination)
+
+      return destination
+    end
+
+    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

@@ -1,6 +1,3 @@
-require_relative 'spec'
-require_relative 'context'
-
 module Kaigara
   class Package
 
@@ -19,7 +16,6 @@ module Kaigara
     def initialize(path = '.')
       @options = {}
       @work_dir = path ? File.expand_path(path) : '.'
-      #self.destination_root = @work_dir
 
       @operations_dir = File.join(@work_dir, OPERATIONS_DIR_NAME)
       @script_path = File.expand_path(File.join(@work_dir, METADATA_FILE_NAME))
@@ -46,7 +42,7 @@ module Kaigara
     end
 
     def execute_operation!(path)
-      context = Context.new path
+      context = Operation.new path
       context.work_dir = @work_dir
       context.environment = @spec.environment
       context.apply!

data/app/models/sysops/spec.rb

@@ -1,5 +1,3 @@
-require_relative 'environment'
-
 class Spec
   attr_accessor :environment
   def initialize(parent)
@@ -22,9 +20,5 @@ class Spec
       source: source
     }
   end
-
-  def vars
-    yield environment
-  end
 end
 

data/app/templates/sysops/Vagrantfile.erb

@@ -3,30 +3,12 @@
 
 Vagrant.configure(2) do |config|
   config.vm.box = "ubuntu/trusty64"
-  
+
   config.vm.provider "virtualbox" do |vb|
-    vb.cpus = "2"
-    vb.memory = "2048"
+    vb.cpus = "1"
+    vb.memory = "1024"
   end
 
-  <% if @project_name -%>
-  config.vm.hostname = "<%= @project_name -%>"
-  <%- else -%>
   config.vm.hostname = "vm"
-  <%- end -%>
-
-  #  config.berkshelf.enabled = true
-  #  node_json = JSON.parse(Pathname(__FILE__).dirname.join('nodes', 'rails.json').read)
-  #  config.vm.provision :chef_solo do |chef|
-  #    chef.node_name = "rails"
-  #    chef.nodes_path = "./nodes"
-  #    chef.environments_path = "./environments"
-  #    chef.cookbooks_path = "./cookbooks"
-  #    chef.data_bags_path = "./data_bags"
-  #    chef.provisioning_path = "/tmp/vagrant-chef"
-  #    chef.run_list = node_json.delete('run_list') if node_json['run_list']
-  #    chef.json = node_json
-  #  end
-
+  config.vm.provision :kaigara
 end
-

data/app/templates/sysops/metadata.rb.erb

@@ -1,8 +1,3 @@
-<% if @name -%>
-name '<%= @name -%>'
-<%- end -%>
-
-<% if @version -%>
-version '<%= @version -%>'
-<%- end -%>
-
+Kaigara::Metadata.new do |v|
+  v.vagrant.home = '/vagrant'
+end

data/lib/kaigara.rb

@@ -1,4 +1,3 @@
-
 require 'thor'
 
 app_path = File.expand_path('../../app', __FILE__)
@@ -10,3 +9,4 @@ require 'kaigara/application'
 
 require 'controllers/sysops'
 require 'kaigara/client'
+require 'kaigara/metadata'

data/lib/kaigara/deephash.rb

@@ -0,0 +1,3 @@
+module Kaigara
+
+end

data/lib/kaigara/metadata.rb

@@ -0,0 +1,35 @@
+require 'json'
+require 'ostruct'
+
+module Kaigara
+  class Metadata
+
+    class DeepHash < Hash
+      def method_missing(name, *args, &block)
+        if name[-1] == '='
+          key = name[0...-1]
+          self[key] = args.first
+          return self[key]
+
+        elsif !has_key?(name)
+          self[name] = DeepHash.new
+        end
+
+        return self[name]
+      end
+    end
+
+    attr_reader :data
+
+    def initialize(&block)
+      hash = DeepHash.new
+      block.call(hash)
+      json = hash.to_json
+      @data = JSON.parse(json, object_class: OpenStruct)
+    end
+
+    def method_missing(name, *args, &block)
+      return @data.send(name)
+    end
+  end
+end

data/lib/kaigara/version.rb

@@ -1,4 +1,4 @@
 module Kaigara
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaigara
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Helios Technologies
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -85,9 +85,8 @@ files:
 - README.md
 - Rakefile
 - app/controllers/sysops.rb
-- app/models/sysops/context.rb
 - app/models/sysops/environment.rb
-- app/models/sysops/kaigara_package.rb
+- app/models/sysops/operation.rb
 - app/models/sysops/package.rb
 - app/models/sysops/spec.rb
 - app/templates/sysops/Vagrantfile.erb
@@ -97,21 +96,12 @@ files:
 - bin/kaish
 - bin/setup
 - kaigara.gemspec
-- kaigara.yml
 - lib/kaigara.rb
 - lib/kaigara/application.rb
 - lib/kaigara/base_controller.rb
-- lib/kaigara/baseops.rb
 - lib/kaigara/client.rb
-- lib/kaigara/sysops.rb
-- lib/kaigara/sysops/context.rb
-- lib/kaigara/sysops/environment.rb
-- lib/kaigara/sysops/kaigara_package.rb
-- lib/kaigara/sysops/package.rb
-- lib/kaigara/sysops/spec.rb
-- lib/kaigara/sysops/templates/Vagrantfile.erb
-- lib/kaigara/sysops/templates/metadata.rb.erb
-- lib/kaigara/sysops/templates/operation.rb.erb
+- lib/kaigara/deephash.rb
+- lib/kaigara/metadata.rb
 - lib/kaigara/version.rb
 homepage: https://github.com/helios-technologies/kaigara
 licenses:

data/app/models/sysops/kaigara_package.rb

@@ -1,28 +0,0 @@
-require 'yaml'
-
-module Kaigara
-  class KaigaraPackage
-    include Thor::Shell
-
-    attr_accessor :name
-    attr_accessor :package_repository
-
-    def initialize(name)
-      @name = name.split('/')
-    end
-
-    def install()
-      # "cd $HOME/.kaish/packages && git clone #{@package_repository}" % @name
-      Dir.mkdir("#{Dir.home}/.kaigara/pkgops/#{@name.last}") # This one's for test
-    end
-
-    def read_config! config
-      conf = config['default']['operation'] || {}
-      @package_repository = conf['package_repository']
-    end
-
-    def is_installed?()
-      Dir.entries(Dir.home + '/.kaigara/pkgops').include? @name.last 
-    end
-  end
-end

data/kaigara.yml

@@ -1,11 +0,0 @@
-default: &default
-  operation:
-    package_repository: github.com/%s/%s.git
-development:
-  <<: *default
-
-test:
-  <<: *default
-
-production:
-  <<: *default

data/lib/kaigara/baseops.rb

@@ -1,8 +0,0 @@
-module Kaigara
-  class Baseops < Thor
-    include Thor::Actions
-    include Thor::Base
-    include Thor::Shell
-  end
-end
-

data/lib/kaigara/sysops.rb

@@ -1,59 +0,0 @@
-require_relative 'sysops/package'
-require_relative 'sysops/kaigara_package'
-
-module Kaigara
-  class Sysops < Baseops
-    no_commands do
-      def self.source_root
-        File.expand_path('sysops/templates', __FILE__)
-      end
-    end
-
-    desc 'create', 'Creates a folder hierarchy'
-    method_option :name, aliases: '-n', desc: 'Project name'
-    method_option :version, aliases: '-v', desc: 'Project version', default: '1.0.0'
-    method_option :path, aliases: '-p', desc: 'Project path', default: '.'
-    def create
-      package = Package.new(options[:path])
-      package.name = options[:name]
-      package.version = options[:version]
-      package.create!
-    end
-
-    desc 'generate <name>', 'Generate a new operation'
-    method_option :path, aliases: '-p', desc: 'Project path', default: '.'
-    def generate(name)
-      package = Package.new(options[:path])
-      package.load!
-      package.create_operation!(name)
-    end
-
-    desc 'exec', 'Execute a package'
-    method_option :path, aliases: '-p', desc: 'Project path', default: '.'
-    def exec
-      package = Package.new(options[:path])
-      say "Executing #{package.name}#{"/#{package.version}" if package.version}...", :yellow
-      package.load!
-      package.run!
-    end
-
-    desc 'install <(github login)/(operation name)>', 'Install a kaigara operation'
-    def install(name)
-      pkg = KaigaraPackage.new(name)
-      begin
-        config = YAML.load_file(File.dirname(__FILE__) + '/../../kaigara.yml')
-        pkg.read_config! config
-      rescue Exception => ex
-        say("Failed to load node configuration! #{ex}", :red)
-      end
-
-      if pkg.is_installed?
-        say('The package is already installed', :green)
-      else
-        say("Installing #{name}...")
-        pkg.install()
-      end
-    end
-  end
-end
-

data/lib/kaigara/sysops/context.rb

@@ -1,56 +0,0 @@
-require 'open3'
-
-module Kaigara
-  class Context
-    class ThorShell < Baseops
-
-      no_commands do
-        def inject(opts = {})
-          opts.each do |k,v|
-            instance_eval { class << self; self end }.send(:attr_accessor, k)
-            send("#{k}=", v)
-          end
-        end
-      end
-    end
-
-    attr_accessor :work_dir
-    attr_accessor :name
-    attr_accessor :environment
-
-    def initialize(path)
-      @shell = ThorShell.new
-      @name = File.basename(path)
-      @content = File.read(path)
-    end
-
-    def apply!
-      @shell.say "Applying #{@name}\n--------------------", :yellow
-      instance_eval @content
-    end
-
-    def execute(cmd)
-      @shell.say "Running: #{cmd}", :yellow
-      stdin, stdout, stderr, wait_thr = Open3.popen3(@environment.variables, cmd)
-      @shell.say stdout.read(), :green
-      @shell.say stderr.read(), :red
-      stdin.close
-      stdout.close
-      stderr.close
-
-      exit_status = wait_thr.value
-      raise 'Non zero result' if exit_status != 0
-    end
-
-    def template(template, target = nil)
-      destination = target
-      destination = "/#{template}" if destination.nil?
-      destination.gsub!(/\.erb$/,'')
-
-      @shell.say "Rendering template #{template} to #{destination}", :yellow
-      @shell.inject(@environment.variables)
-      @shell.template(File.join(@work_dir, 'tpl', template), destination)
-    end
-  end
-end
-

data/lib/kaigara/sysops/environment.rb

@@ -1,14 +0,0 @@
-module Kaigara
-  class Environment
-    attr_accessor :variables
-
-    def initialize
-      @variables = {}
-    end
-
-    def method_missing(method_sym, *arguments, &block)
-      @variables[method_sym.to_s] = arguments[0] rescue nil
-    end
-  end
-end
-

data/lib/kaigara/sysops/kaigara_package.rb

@@ -1,28 +0,0 @@
-require 'yaml'
-
-module Kaigara
-  class KaigaraPackage
-    include Thor::Shell
-
-    attr_accessor :name
-    attr_accessor :package_repository
-
-    def initialize(name)
-      @name = name.split('/')
-    end
-
-    def install()
-      # "cd $HOME/.kaish/packages && git clone #{@package_repository}" % @name
-      Dir.mkdir("#{Dir.home}/.kaigara/pkgops/#{@name.last}") # This one's for test
-    end
-
-    def read_config! config
-      conf = config['default']['operation'] || {}
-      @package_repository = conf['package_repository']
-    end
-
-    def is_installed?()
-      Dir.entries(Dir.home + '/.kaigara/pkgops').include? @name.last 
-    end
-  end
-end

data/lib/kaigara/sysops/package.rb

@@ -1,69 +0,0 @@
-require_relative 'spec'
-require_relative 'context'
-
-module Kaigara
-  class Package
-    include Thor::Base
-    include Thor::Actions
-
-    source_root File.expand_path('../templates', __FILE__)
-
-    METADATA_FILE_NAME = 'metadata.rb'
-    VAGRANT_FILE_NAME = 'Vagrantfile'
-    OPERATIONS_DIR_NAME = 'operations'
-    RESOURCES_DIR_NAME = 'resources'
-
-    attr_accessor :work_dir
-    attr_accessor :operations_dir
-    attr_accessor :script_path
-    attr_accessor :dependencies
-    attr_accessor :version
-    attr_accessor :name
-
-    def initialize(path)
-      path ||= '.'
-      @options = {}
-      @work_dir = File.expand_path(path)
-      self.destination_root = @work_dir
-
-      @operations_dir = File.join(@work_dir, OPERATIONS_DIR_NAME)
-      @script_path = File.expand_path(File.join(@work_dir, METADATA_FILE_NAME))
-      @spec = Spec.new(self)
-    end
-
-    # Read and execute metadata.rb
-    def load!
-      script = File.read(@script_path)
-      @spec.instance_eval(script)
-    end
-
-    # Create an empty project structure
-    def create!
-      template('metadata.rb.erb', File.join(@work_dir, METADATA_FILE_NAME))
-      template('Vagrantfile.erb', File.join(@work_dir, VAGRANT_FILE_NAME))
-      empty_directory(File.join(@work_dir, OPERATIONS_DIR_NAME))
-      empty_directory(File.join(@work_dir, RESOURCES_DIR_NAME))
-    end
-
-    # Create an empty operation in ./operations
-    def create_operation!(name)
-      prefix = DateTime.now.strftime('%Y%m%d%H%M%S')
-      template('operation.rb.erb', File.join(@operations_dir, "#{prefix}_#{name}.rb"))
-    end
-
-    # Execute operations in the operations directory one by one
-    def run!
-      Dir[File.join(@operations_dir, '*.rb')].each do |x|
-        execute_operation!(x)
-      end
-    end
-
-    def execute_operation!(path)
-      context = Context.new path
-      context.work_dir = @work_dir
-      context.environment = @spec.environment
-      context.apply!
-    end
-  end
-end
-

data/lib/kaigara/sysops/spec.rb

@@ -1,30 +0,0 @@
-require_relative 'environment'
-
-class Spec
-  attr_accessor :environment
-  def initialize(parent)
-    @environment = Kaigara::Environment.new
-    @parent = parent
-  end
-
-  def name(value)
-    @parent.name = value
-  end
-
-  def version(value)
-    @parent.version = value
-  end
-
-  def dep(name, version: nil, source: nil)
-    @parent.dependencies ||= {}
-    @parent.dependencies[name] = {
-      version: version,
-      source: source
-    }
-  end
-
-  def vars
-    yield environment
-  end
-end
-

data/lib/kaigara/sysops/templates/Vagrantfile.erb

@@ -1,32 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure(2) do |config|
-  config.vm.box = "ubuntu/trusty64"
-  
-  config.vm.provider "virtualbox" do |vb|
-    vb.cpus = "2"
-    vb.memory = "2048"
-  end
-
-  <% if @project_name -%>
-  config.vm.hostname = "<%= @project_name -%>"
-  <%- else -%>
-  config.vm.hostname = "vm"
-  <%- end -%>
-
-  #  config.berkshelf.enabled = true
-  #  node_json = JSON.parse(Pathname(__FILE__).dirname.join('nodes', 'rails.json').read)
-  #  config.vm.provision :chef_solo do |chef|
-  #    chef.node_name = "rails"
-  #    chef.nodes_path = "./nodes"
-  #    chef.environments_path = "./environments"
-  #    chef.cookbooks_path = "./cookbooks"
-  #    chef.data_bags_path = "./data_bags"
-  #    chef.provisioning_path = "/tmp/vagrant-chef"
-  #    chef.run_list = node_json.delete('run_list') if node_json['run_list']
-  #    chef.json = node_json
-  #  end
-
-end
-

data/lib/kaigara/sysops/templates/metadata.rb.erb

@@ -1,8 +0,0 @@
-<% if @name -%>
-name '<%= @name -%>'
-<%- end -%>
-
-<% if @version -%>
-version '<%= @version -%>'
-<%- end -%>
-

data/lib/kaigara/sysops/templates/operation.rb.erb

@@ -1,2 +0,0 @@
-## Created on <%= DateTime.now.strftime('%Y/%m/%d')%>
-