osx_provision 0.9.7 → 0.9.8

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MmQxMzkyM2Y4YTI4Yzg3ZWFmMTFiZjc3ZTI4MWRjMzAzMTQzNjVmOQ==
+  data.tar.gz: !binary |-
+    MDkyODdiNGQzYTA0ZDNkYWJjZTEzZjc3YjdmZjVmZDg0NTU0ZGRhYg==
+SHA512:
+  metadata.gz: !binary |-
+    NzQxNWMxYmVhZmM1MjI1ZDY4N2I3YjI4OTVkYmQ0NjZkMThhZTlkYTc5YmFj
+    YjU4MDYxYjIyZGZlMjdmOGI3ODcwN2ZiYzExMjE2NGE1YjI2MTkzNGNjOWM3
+    MzllZGE1ZGI1MTIzNjk4YWIwMWQ4ZWYwODhjNzMzM2MyZTIwN2E=
+  data.tar.gz: !binary |-
+    Y2E4YzAzM2QyYmVlYmQ1ZGVjNWY3YzFhOWQzYWQ5NWFjZGVkNDgwMjBlMGUy
+    MzIzZDNjYWM0MDZlMGM0NDE4ODAwMzYwZmE1ZTUzYzc0MDMyZmNhMWJlMjg0
+    MDYwMDRhMDBhYTZkN2JlYzU1NWE3OGVjMjMzNWQzZjBmNmY5YTc=

data/CHANGES

@@ -30,4 +30,8 @@
 
 == Version 0.9.7
 
-* Bug fix.
+* Bug fix.
+
+== Version 0.9.8
+
+* Bump script_executor version.

data/Gemfile

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 group :default do
   gem "text-interpolator", "~>1.0"
-  gem "script_executor", "~>1.4"
+  gem "script_executor", "~>1.5"
   gem "thor", "~>0.19"
   gem "json_pure", "~>1.8"
 end

data/lib/osx_provision/osx_provision.rb

@@ -1,6 +1,6 @@
-require 'osx_provision/generic_provision'
+require 'script_executor/base_provision'
 
-class OsxProvision < GenericProvision
+class OsxProvision < BaseProvision
   USER_LOCAL_BIN = "/usr/local/bin"
 
   def initialize parent_class, config_file_name=".osx_provision.json", scripts_file_names=[]
@@ -9,11 +9,11 @@ class OsxProvision < GenericProvision
     super
   end
 
-  def prepare
-    env['password'] = ask_password("Enter password for #{env[:node][:user]}: ")
-
-    run(server_info.merge(capture_output: false, sudo: true), "prepare", env)
-  end
+  # def prepare
+  #   env['password'] = ask_password("Enter password for #{env[:node][:user]}: ")
+  #
+  #   run(server_info.merge(capture_output: false, sudo: true), "prepare", env)
+  # end
 
   def brew
     installed = package_installed("#{USER_LOCAL_BIN}/brew")
@@ -55,10 +55,6 @@ class OsxProvision < GenericProvision
     end
   end
 
-  def init_launch_agent
-    run(server_info, "init_launch_agent", env)
-  end
-
   def mysql
     installed = package_installed "#{USER_LOCAL_BIN}/mysql"
 
@@ -91,14 +87,6 @@ class OsxProvision < GenericProvision
     run(server_info, "postgres_restart", env.merge({started: started}))
   end
 
-  def postgres_stop
-    run server_info, "postgres_stop", env
-  end
-
-  def postgres_start
-    run server_info, "postgres_start", env
-  end
-
   def ruby
     installed = package_installed "#{ENV['HOME']}/.rvm/rubies/ruby-1.9.3-p527/bin/ruby"
 
@@ -141,10 +129,6 @@ class OsxProvision < GenericProvision
     run(server_info, "selenium_restart", env.merge({started: started}))
   end
 
-  def postgres_create_user
-    run(server_info, "postgres_create_user", env)
-  end
-
   def postgres_create_schemas
     env[:postgres][:app_schemas].each do |schema|
       run(server_info, "postgres_create_schema", env.merge(schema: schema))
@@ -157,18 +141,6 @@ class OsxProvision < GenericProvision
     end
   end
 
-  def postgres_drop_user
-    run(server_info, "postgres_drop_user", env)
-  end
-
-  def mysql_create_user
-    run(server_info, "mysql_create_user", env)
-  end
-
-  def mysql_drop_user
-    run(server_info, "mysql_drop_user", env)
-  end
-
   def mysql_create_schemas
     env[:mysql][:app_schemas].each do |schema|
       run(server_info, "mysql_create_schema", env.merge(schema: schema))

data/lib/osx_provision/version.rb

@@ -1,3 +1,3 @@
 class OsxProvision
-  VERSION = "0.9.7"
+  VERSION = "0.9.8"
 end

data/osx_provision.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 
   
   spec.add_runtime_dependency "text-interpolator", ["~> 1.0"]
-  spec.add_runtime_dependency "script_executor", ["~> 1.4"]
+  spec.add_runtime_dependency "script_executor", ["~> 1.5"]
   spec.add_runtime_dependency "thor", ["~> 0.19"]
   spec.add_runtime_dependency "json_pure", ["~> 1.8"]
   spec.add_development_dependency "gemspec_deps_gen", ["~> 1.1"]

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osx_provision
 version: !ruby/object:Gem::Version
-  version: 0.9.7
-  prerelease: 
+  version: 0.9.8
 platform: ruby
 authors:
 - Alexander Shvets
@@ -14,7 +13,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: text-interpolator
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,23 +27,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: script_executor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gemspec_deps_gen
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gemcutter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -124,7 +111,6 @@ files:
 - Rakefile
 - Thorfile
 - lib/osx_provision.rb
-- lib/osx_provision/generic_provision.rb
 - lib/osx_provision/osx_provision.rb
 - lib/osx_provision/osx_provision_scripts.sh
 - lib/osx_provision/version.rb
@@ -136,27 +122,26 @@ files:
 - thor/project_scripts.sh
 homepage: http://github.com/shvets/osx_provision
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Library for building Mac OSX provisioning
 test_files:
 - spec/osx_provision_spec.rb

data/lib/osx_provision/generic_provision.rb

@@ -1,79 +0,0 @@
-require 'json'
-require "highline"
-
-require 'text_interpolator'
-require 'script_executor/executable'
-require 'script_executor/script_locator'
-
-class GenericProvision
-  include Executable, ScriptLocator
-
-  attr_reader :interpolator, :env, :script_list, :server_info
-
-  def initialize parent_class, config_file_name, scripts_file_names
-    @interpolator = TextInterpolator.new
-
-    @env = read_config(config_file_name)
-
-    @script_list = {}
-
-    scripts_file_names.each do |name|
-      @script_list.merge!(scripts(name))
-    end
-
-    create_script_methods
-
-    create_thor_methods(parent_class) if parent_class.ancestors.include?(Thor)
-
-    @server_info = env[:node] ? env[:node] : {}
-  end
-
-  protected
-
-  def create_script_methods
-    script_list.keys.each do |name|
-      singleton_class.send(:define_method, name.to_sym) do
-        self.send :run, server_info, name.to_s, env
-      end
-    end
-  end
-
-  def create_thor_methods parent_class
-    provision = self
-
-    provision.script_list.each do |name, value|
-      title = provision.script_title(value)
-
-      title = title.nil? ? name : title
-
-      parent_class.send(:desc, name, title) if parent_class.respond_to?(:desc)
-
-      parent_class.send(:define_method, name.to_sym) do
-        provision.send "#{name}".to_sym
-      end
-    end
-  end
-
-  def read_config config_file_name
-    hash = JSON.parse(File.read(config_file_name), :symbolize_names => true)
-
-    interpolator.interpolate hash
-  end
-
-  def terminal
-    @terminal ||= HighLine.new
-  end
-
-  def ask_password message
-    terminal.ask(message) { |q| q.echo = "*" }
-  end
-
-  def run server_info, script_name, params
-    execute(server_info) { evaluate_script_body(script_list[script_name], params, :string) }
-  end
-
-  def run_command server_info, command
-    execute(server_info.merge({script: command}))
-  end
-
-end