osx_provision 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 172e6b6dc672db164ae68d7e8159382c6fb8b1c5
-  data.tar.gz: 02625a468084a21a7d3438b02300ee6967a1b4e9
+  metadata.gz: e8a6f0c727bfe2456a12a469d9f01a94b4149062
+  data.tar.gz: 6d6fbd395803b7c2697daacecc1551f31f89c405
 SHA512:
-  metadata.gz: 0f0a63e5afe741760cf26208ceaeca3b61733d079c0930d2d5632b7816971aaafe844a59fa0b00a8e27654b9327a2c1f03f3590269e2b5321ef71d28904a7073
-  data.tar.gz: 5e0850d86bc7ab3a074948f1dd9d0b6a733683c4d954530aaf56c6b37651bfa4ba107708615882593f990edf03d439db793f859fa8a791fd06c8fd80e09469ab
+  metadata.gz: 45f6ab87c51f79049a231139610e53ce47a7b09638a8e2f514c3476b6d3c2dda09ef10b089d0b566b6a737af07706372d779ca340bf75fafbfd1502e9d059e4e
+  data.tar.gz: 706542524a790db5c9c5a7acd729f885a5513ef04b29b6361b2c5a424a5dbc49fa76753891b73bcb34d435db3ea0736ef63e1c95d3efeb8df879675b3c52fc8b

data/CHANGES

@@ -22,4 +22,8 @@
 
 == Version 0.9.5
 
-* Bug fix.
+* Bug fix.
+
+== Version 0.9.6
+
+* Expose script methods as thor tasks.

data/lib/osx_provision/generic_provision.rb

@@ -10,7 +10,7 @@ class GenericProvision
 
   attr_reader :interpolator, :env, :script_list, :server_info
 
-  def initialize config_file_name, scripts_file_names
+  def initialize parent_class, config_file_name, scripts_file_names
     @interpolator = TextInterpolator.new
 
     @env = read_config(config_file_name)
@@ -23,9 +23,13 @@ class GenericProvision
 
     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
@@ -34,7 +38,21 @@ class GenericProvision
     end
   end
 
-  protected
+  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)

data/lib/osx_provision/osx_provision.rb

@@ -3,7 +3,7 @@ require 'osx_provision/generic_provision'
 class OsxProvision < GenericProvision
   USER_LOCAL_BIN = "/usr/local/bin"
 
-  def initialize config_file_name=".osx_provision.json", scripts_file_names=[]
+  def initialize parent_class, config_file_name=".osx_provision.json", scripts_file_names=[]
     scripts_file_names.unshift(File.expand_path("osx_provision_scripts.sh", File.dirname(__FILE__))) # make it first
 
     super

data/lib/osx_provision/version.rb

@@ -1,3 +1,3 @@
 class OsxProvision
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end

data/thor/osx_install.thor

@@ -3,25 +3,12 @@ $: << File.expand_path(File.dirname(__FILE__) + '/../lib')
 require 'osx_provision/osx_provision'
 
 class OsxInstall < Thor
-  def self.installer
-    @@installer ||= OsxProvision.new ".osx_provision.json", [File.expand_path("project_scripts.sh", File.dirname(__FILE__))]
-  end
-
-  def self.create_thor_script_methods parent_class
-    installer.script_list.each do |name, value|
-      title = installer.script_title(value)
+  @installer = OsxProvision.new self, ".osx_provision.json", [File.expand_path("project_scripts.sh", File.dirname(__FILE__))]
 
-      title = title.nil? ? name : title
-
-      parent_class.send :desc, name, title
-      parent_class.send(:define_method, name.to_sym) do
-        self.class.installer.send "#{name}".to_sym
-      end
-    end
+  class << self
+    attr_reader :installer
   end
 
-  create_thor_script_methods self
-
   desc "all", "Installs all required packages"
   def all
     invoke :brew
@@ -52,22 +39,22 @@ class OsxInstall < Thor
 
   desc "postgres_create_schemas", "Initializes postgres schemas"
   def postgres_create_schemas
-    self.class.installer.postgres_create_schemas
+    OsxInstall.installer.postgres_create_schemas
   end
 
   desc "postgres_drop_schemas", "Drops postgres schemas"
   def postgres_drop_schemas
-    self.class.installer.postgres_drop_schemas
+    OsxInstall.installer.postgres_drop_schemas
   end
 
   desc "mysql_create_schemas", "Initializes mysql schemas"
   def mysql_create_schemas
-    self.class.installer.mysql_create_schemas
+    OsxInstall.installer.mysql_create_schemas
   end
 
   desc "mysql_drop_schemas", "Drops mysql schemas"
   def mysql_drop_schemas
-    self.class.installer.mysql_drop_schemas
+    OsxInstall.mysql_drop_schemas
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osx_provision
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: text-interpolator