osx_provision 0.9.3 → 0.9.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MjFhMWFkNDdlZWY1NGYyOThmNzQ1N2M3YTQzYzVjYmIyMjI5OTUyMQ==
-  data.tar.gz: !binary |-
-    ZTU1NGY0YThjMGM3YTYwZWM3ZmVkM2ZkYzVlNjJhNWY3NWRkMzU4NA==
+SHA1:
+  metadata.gz: 9060e75aeda053718ddf9ee5a8bf7b6b275aa2df
+  data.tar.gz: 182fcf1605ce989a1605f4d57a36ebe333cff7c4
 SHA512:
-  metadata.gz: !binary |-
-    MWQ0MmNjZTU3ZWJjYmJiMTVjY2VmNWQ4MzFhMDM4MDJlYjg3YTQxN2JhYzQ4
-    ZWU4M2QwZTdiZDRjM2VkOWMyMjVlN2I5YmNkYmM3Yzc3YzdkOGU2ODY2NDg1
-    OTljNmVmYzM1MjA2MGNmMjIyN2RmMGM5NDgyOWY1ZWJmMjQ0OTQ=
-  data.tar.gz: !binary |-
-    MWM5NjY0MTFjN2YxOGVjMTUzOTVmZjkzMmU2YTRmYWQ4NjlhNmVkZTNjMDAy
-    Y2IxZjY2Y2E5MjQ3ZmQ2NjIwODg5Y2MxZWQ3ZWM2NWE3OGJmNGY1Nzg5ODAx
-    MzBlNzE0YjA5MWZlYzA4NjE3NmQzM2QxMTNlMzhlOTYwZDgxODQ=
+  metadata.gz: b2287fc9d00f947627d1459c191a6d89ca0224d73147b1e67d399f214052987286d6e0417e84384e552d217928fdf1b16a03367f8330b43fc9ce58f548551ffb
+  data.tar.gz: d87b3ba5aa3b4f25f54f1d517bac9962d4314ab5b156d5dbfd6fa85f968889b48e2d085ffd47c3dc45939119cff89bb017ab7f4cb823186c5ac441a006ae91e7

data/{osx_provision.json → .osx_provision.json}

@@ -3,20 +3,25 @@
     "domain": "127.0.0.1",
     "user": "ENV['USER']",
     "home": "ENV['HOME']",
+    "port": "",
     "remote": false
   },
 
+  "project": {
+    "home": "#{node.home}/osx_provision/demo",
+    "ruby_version": "1.9.3",
+    "gemset": "osx_provision"
+  },
+
   "postgres": {
     "hostname": "localhost", "user": "postgres", "password": "postgres",
-
-    "app_user": "ruby_dev_user",
+    "app_user": "ruby_dev", "app_password": "ruby_dev",
     "app_schemas": ["ruby_dev_test", "ruby_dev_dev", "ruby_dev_prod"]
   },
 
   "mysql": {
     "hostname": "localhost", "user": "root", "password": "root",
-
-    "app_user": "ruby_dev_user",
+    "app_user": "ruby_dev", "app_password": "ruby_dev",
     "app_schemas": ["ruby_dev_test", "ruby_dev_dev", "ruby_dev_prod"]
   }
 

data/CHANGES

@@ -14,4 +14,8 @@
 
 == Version 0.9.3
 
+* Bug fix.
+
+== Version 0.9.4
+
 * Bug fix.

data/README.md

@@ -7,6 +7,7 @@ Add this line to your application's Gemfile:
 ```bash
 gem 'osx_provision'
 ```
+
 And then execute:
 
 ```bash

data/lib/osx_provision/generic_provision.rb

@@ -21,27 +21,19 @@ class GenericProvision
       @script_list.merge!(scripts(name))
     end
 
-    # create_script_methods parent, self
+    create_script_methods
 
     @server_info = env[:node] ? env[:node] : {}
   end
 
-  # def create_script_methods parent, current
-  #   parent_metaclass = parent.singleton_class
-  #   current_metaclass = current.singleton_class
-  #
-  #   current.script_list.keys.each do |name|
-  #     # create methods on parent, e.g. thor or rake file
-  #     parent_metaclass.send(:define_method, name.to_sym) do |*args, &block|
-  #       current.send(name, args, block)
-  #     end
-  #
-  #     # create methods on installer
-  #     current_metaclass.send(:define_method, name.to_sym) do |_, _|
-  #       current.send :run, current.server_info, name.to_s, current.env
-  #     end
-  #   end
-  # end
+  def create_script_methods
+    script_list.keys.each do |name|
+      new_name = "#{name}_script"
+      singleton_class.send(:define_method, new_name.to_sym) do
+        self.send :run, server_info, new_name.to_s, env
+      end
+    end
+  end
 
   protected
 

data/lib/osx_provision/osx_provision.rb

@@ -3,6 +3,12 @@ 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=[]
+    scripts_file_names.unshift(File.expand_path("osx_provision_scripts.sh", File.dirname(__FILE__))) # make it first
+
+    super
+  end
+
   def prepare
     env['password'] = ask_password("Enter password for #{env[:node][:user]}: ")
 
@@ -135,85 +141,53 @@ class OsxProvision < GenericProvision
     run(server_info, "selenium_restart", env.merge({started: started}))
   end
 
-  def postgres_create user, schemas
-    create_postgres_user user, schemas.first
-
-    schemas.each do |schema|
-      create_postgres_schema user, schema
-    end
+  def postgres_create_user
+    run(server_info, "postgres_create_user", env)
   end
 
-  def postgres_drop user, schemas
-    schemas.each do |schema|
-      drop_postgres_schema schema
+  def postgres_create_schemas
+    env[:postgres][:app_schemas].each do |schema|
+      run(server_info, "postgres_create_schema", env.merge(schema: schema))
     end
-
-    drop_postgres_user user, schemas.first
-  end
-
-  def postgres_test schema
-    result = get_postgres_schemas schema
-
-    puts result
-  end
-
-  private
-
-  def service_started name
-    result = run server_info.merge(:suppress_output => true, :capture_output => true),
-                 "service_started", env.merge({name: name})
-
-    result.chomp.size > 0
   end
 
-  def create_mysql_user app_user
-    run(server_info, "create_mysql_user", env.merge({app_user: app_user}))
-  end
-
-  def create_mysql_schema schema
-    schema_exists = mysql_schema_exist?(config[:mysql][:hostname], config[:mysql][:user], config[:mysql][:password], schema)
-
-    run(server_info, "create_mysql_schema", env) unless schema_exists
-  end
-
-  def mysql_schema_exist?(hostname, user, password, schema)
-    get_mysql_schemas(hostname, user, password, schema).include?(schema)
+  def postgres_drop_schemas
+    env[:postgres][:app_schemas].each do |schema|
+      run(server_info, "postgres_drop_schema", env.merge(schema: schema))
+    end
   end
 
-  def get_mysql_schemas hostname, user, password, schema
-    command = "#{USER_LOCAL_BIN}/mysql -h #{hostname} -u #{user} -p\"#{password}\" -e \"SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA;\""
-
-    run_command server_info.merge(:suppress_output => true, :capture_output => true), command
+  def postgres_drop_user
+    run(server_info, "postgres_drop_user", env)
   end
 
-  def postgres_schema_exist?(schema)
-    get_postgres_schemas(schema).include?(schema)
+  def mysql_create_user
+    run(server_info, "mysql_create_user", env)
   end
 
-  def get_postgres_schemas schema
-    command = "#{USER_LOCAL_BIN}/psql -d #{schema} -c '\\l'"
-
-    run_command server_info.merge(:suppress_output => true, :capture_output => true), command
+  def mysql_drop_user
+    run(server_info, "mysql_drop_user", env)
   end
 
-  def create_postgres_user app_user, schema
-    run(server_info, "create_postgres_user", env.merge({app_user: app_user, schema: schema}))
+  def mysql_create_schemas
+    env[:mysql][:app_schemas].each do |schema|
+      run(server_info, "mysql_create_schema", env.merge(schema: schema))
+    end
   end
 
-  def drop_postgres_user app_user, schema
-    command = "#{USER_LOCAL_BIN}/dropuser #{app_user}"
-
-    run_command server_info, command
+  def mysql_drop_schemas
+    env[:mysql][:app_schemas].each do |schema|
+      run(server_info, "mysql_drop_schema", env.merge(schema: schema))
+    end
   end
 
-  def create_postgres_schema app_user, schema
-    run(server_info, "create_postgres_schema", env.merge({app_user: app_user, schema: schema}))
-  end
+  private
 
-  def drop_postgres_schema schema
-    command = "#{USER_LOCAL_BIN}/dropdb #{schema}"
+  def service_started name
+    result = run server_info.merge(:suppress_output => true, :capture_output => true),
+                 "service_started", env.merge({name: name})
 
-    run_command server_info, command
+    result.chomp.size > 0
   end
 
   def package_installed package_path

data/lib/osx_provision/osx_provision_scripts.sh

@@ -53,22 +53,25 @@ mkdir #{home}/Library/LaunchAgents/
 [mysql]
 
 PATH=$PATH:/usr/local/bin
-USER_HOME="#{node.home}"
+USER_HOME='#{node.home}'
+
+USER='#{mysql.user}'
+PASSWORD='#{mysql.password}'
 
 brew install mysql
 
 mkdir -p $USER_HOME/Library/LaunchAgents
 
-ln -sfv /usr/local/opt/mysql/*.plist $USER_HOME/Library/LaunchAgents
+sudo ln -sfv /usr/local/opt/mysql/*.plist $USER_HOME/Library/LaunchAgents
 
-mysqladmin -u root password 'root'
+mysqladmin -u$USER password $PASSWORD
 
 
 #######################################
 [mysql_restart]
 
-STARTED="[#{started}]"
-USER_HOME="#{node.home}"
+STARTED='[#{started}]'
+USER_HOME='#{node.home}'
 
 if [ "$STARTED" = "[true]" ] ; then
   launchctl unload $USER_HOME/Library/LaunchAgents/homebrew.mxcl.mysql.plist
@@ -77,36 +80,6 @@ fi
 launchctl load $USER_HOME/Library/LaunchAgents/homebrew.mxcl.mysql.plist
 
 
-#######################################
-[create_mysql_user]
-
-PATH=$PATH:/usr/local/bin
-
-APP_USER='#{app_user}'
-HOST_NAME='#{mysql[:hostname]}'
-USER='#{mysql[:user]}'
-PASSWORD='#{mysql][:password]}'
-
-mysql -h $HOST_NAME -u root -p"root" -e "DROP USER '$APP_USER'@'$HOST_NAME';"
-mysql -h $HOST_NAME -u root -p"root" -e "CREATE USER '$APP_USER'@'$HOST_NAME' IDENTIFIED BY '$APP_USER';"
-
-mysql -h $HOST_NAME -u root -p"root" -e "grant all privileges on *.* to '$APP_USER'@'$HOST_NAME' identified by '$APP_USER' with grant option;"
-mysql -h $HOST_NAME -u root -p"root" -e "grant all privileges on *.* to '$APP_USER'@'%' identified by '$APP_USER' with grant option;"
-
-
-#######################################
-[create_mysql_schema]
-
-PATH=$PATH:/usr/local/bin
-
-SCHEMA='#{schema}'
-HOST_NAME='#{mysql[:hostname]}'
-USER='#{mysql[:user]}'
-PASSWORD='#{mysql[:password]}'
-
-mysql -h $HOST_NAME -u root -p"root" -e "create database $SCHEMA;"
-
-
 #######################################
 [postgres]
 
@@ -150,26 +123,102 @@ launchctl load -w $USER_HOME/Library/LaunchAgents/homebrew.mxcl.postgresql.plist
 
 
 #######################################
-[create_postgres_user]
+[postgres_create_user]
 
 PATH=$PATH:/usr/local/bin
 
-APP_USER='#{app_user}'
+APP_USER='#{postgres.app_user}'
 
 createuser -s -d -r $APP_USER
 
 
 #######################################
-[create_postgres_schema]
+[postgres_create_schema]
 
 PATH=$PATH:/usr/local/bin
 
-APP_USER='#{app_user}'
+APP_USER='#{postgres.app_user}'
 SCHEMA='#{schema}'
 
 createdb -U $APP_USER $SCHEMA
 
 
+#######################################
+[postgres_drop_schema]
+
+PATH=$PATH:/usr/local/bin
+
+SCHEMA='#{schema}'
+
+dropdb $SCHEMA
+
+
+#######################################
+[postgres_drop_user]
+
+PATH=$PATH:/usr/local/bin
+
+APP_USER='#{postgres.app_user}'
+
+dropuser $APP_USER
+
+
+#######################################
+[mysql_create_user]
+
+PATH=$PATH:/usr/local/bin
+
+HOST_NAME='#{mysql.hostname}'
+APP_USER='#{mysql.app_user}'
+USER='#{mysql.user}'
+PASSWORD='#{mysql.password}'
+
+mysql -h $HOST_NAME -u$USER -p$PASSWORD -e "CREATE USER '$APP_USER'@'$HOST_NAME' IDENTIFIED BY '$APP_USER';"
+mysql -h $HOST_NAME -u$USER -p$PASSWORD -e "GRANT ALL PRIVILEGES ON *.* to '$APP_USER'@'$HOST_NAME' IDENTIFIED BY '$APP_USER' WITH GRANT OPTION;"
+
+#######################################
+[mysql_drop_user]
+
+PATH=$PATH:/usr/local/bin
+
+HOST_NAME='#{mysql.hostname}'
+USER='#{mysql.user}'
+PASSWORD='#{mysql.password}'
+APP_USER='#{mysql.app_user}'
+
+mysql -h $HOST_NAME -u$USER -p$PASSWORD -e "DROP USER '$APP_USER'@'$HOST_NAME';"
+
+
+#######################################
+[mysql_create_schema]
+
+PATH=$PATH:/usr/local/bin
+
+SCHEMA='#{schema}'
+
+HOST_NAME='#{mysql.hostname}'
+USER='#{mysql.user}'
+PASSWORD='#{mysql.password}'
+APP_USER='#{mysql.app_user}'
+
+mysql -h $HOST_NAME -u$USER -p$PASSWORD -e "create database $SCHEMA;"
+
+
+#######################################
+[mysql_drop_schema]
+
+PATH=$PATH:/usr/local/bin
+
+SCHEMA='#{schema}'
+
+HOST_NAME='#{mysql.hostname}'
+USER='#{mysql.user}'
+PASSWORD='#{mysql.password}'
+APP_USER='#{mysql.app_user}'
+
+mysql -h $HOST_NAME -u$USER -p$PASSWORD -e "drop database $SCHEMA;"
+
+
 #######################################
 [ruby]
 
@@ -219,7 +268,7 @@ ln -sfv /usr/local/opt/selenium-server-standalone/*.plist $USER_HOME/Library/Lau
 STARTED="[#{started}]"
 USER_HOME="#{node.home}"
 
-if [ "$STARTED" = "true" ] ; then
+if [ "$STARTED" = "[true]" ] ; then
   launchctl unload $USER_HOME/Library/LaunchAgents/homebrew.mxcl.selenium-server-standalone.plist
 fi
 
@@ -241,7 +290,7 @@ ls #{package_path}
 #######################################
 [service_started]
 
-NAME="#{name%}"
+NAME="#{name}"
 
 TEMPFILE="$(mktemp XXXXXXXX)"
 launchctl list | grep $NAME > $TEMPFILE

data/lib/osx_provision/version.rb

@@ -1,3 +1,3 @@
 class OsxProvision
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

data/thor/osx_install.thor

@@ -3,14 +3,25 @@ $: << File.expand_path(File.dirname(__FILE__) + '/../lib')
 require 'osx_provision/osx_provision'
 
 class OsxInstall < Thor
-  attr_reader :installer
+  def self.installer
+    @@installer ||= OsxProvision.new ".osx_provision.json"
+  end
+
+  def self.create_thor_script_methods parent_class
+    installer.script_list.each do |name, value|
+      title = installer.script_title(value)
 
-  def initialize *params
-    @installer = OsxProvision.new ".osx_provision.json", "osx_provision_scripts.sh"
+      title = title.nil? ? name : title
 
-    super *params
+      parent_class.send :desc, name, title
+      parent_class.send(:define_method, name.to_sym) do
+        self.class.installer.send "#{name}".to_sym
+      end
+    end
   end
 
+  create_thor_script_methods self
+
   desc "all", "Installs all required packages"
   def all
     invoke :brew
@@ -32,63 +43,31 @@ class OsxInstall < Thor
 
     invoke :ruby
 
-    invoke :postgres_create
-  end
+    invoke :postgres_create_user
+    invoke :postgres_create_schemas
 
-  desc "mysql_restart", "Restarts mysql server"
-  def mysql_restart
-    installer.mysql_restart
+    invoke :mysql_create_user
+    invoke :mysql_create_schemas
   end
 
-  desc "postgres_restart", "Restarts postgres server"
-  def postgres_restart
-    installer.postgres_restart
+  desc "postgres_create_schemas", "Initializes postgres schemas"
+  def postgres_create_schemas
+    self.class.installer.postgres_create_schemas
   end
 
-  desc "postgres_stop", "Stop postgres server"
-  def postgres_stop
-    installer.postgres_stop
+  desc "postgres_drop_schemas", "Drops postgres schemas"
+  def postgres_drop_schemas
+    self.class.installer.postgres_drop_schemas
   end
 
-  desc "postgres_start", "Start postgres server"
-  def postgres_start
-    installer.postgres_start
+  desc "mysql_create_schemas", "Initializes mysql schemas"
+  def mysql_create_schemas
+    self.class.installer.mysql_create_schemas
   end
 
-  desc "jenkins_restart", "Restart jenkins server"
-  def jenkins_restart
-    installer.jenkins_restart
-  end
-
-  desc "selenium_restart", "Restarts selenium server"
-  def selenium_restart
-    installer.selenium_restart
-  end
-
-  desc "postgres_create", "Initializes postgres project schemas"
-  def postgres_create
-    installer.postgres_create env["app_user"], env["app_schemas"]
-  end
-
-  desc "postgres_drop", "Drops postgres project schemas"
-  def postgres_drop
-    installer.postgres_drop env["app_user"], env["app_schemas"]
-  end
-
-  desc "postgres_test", "Test postgres schemas"
-  def postgres_test
-    installer.postgres_test env["app_user"]
-  end
-
-  desc "test", "test"
-  def test
-    puts "test"
-  end
-
-  private
-
-  def method_missing(method, *args, &block)
-    installer.send(method, *args, &block)
+  desc "mysql_drop_schemas", "Drops mysql schemas"
+  def mysql_drop_schemas
+    self.class.installer.mysql_drop_schemas
   end
 
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: osx_provision
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: text-interpolator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: script_executor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: gemspec_deps_gen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: gemcutter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 description: Library for building Mac OSX computer provisioning
@@ -100,9 +100,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
+- ".gitignore"
+- ".osx_provision.json"
+- ".ruby-gemset"
+- ".ruby-version"
 - CHANGES
 - Gemfile
 - LICENSE
@@ -116,7 +117,6 @@ files:
 - lib/osx_provision/version.rb
 - osx_provision.gemspec
 - osx_provision.gemspec.erb
-- osx_provision.json
 - spec/osx_provision_spec.rb
 - spec/spec_helper.rb
 - thor/osx_install.thor
@@ -129,12 +129,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []