osx_provision 0.9.6 → 0.9.7

data/CHANGES

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

data/lib/osx_provision/osx_provision_scripts.sh

@@ -3,7 +3,9 @@
 #######################################
 [prepare]
 
-xcodebuild -license
+#xcodebuild -license
+
+mkdir #{home}/Library/LaunchAgents/
 
 
 #######################################
@@ -43,20 +45,15 @@ PATH=$PATH:/usr/local/bin
 brew install qt
 
 
-#######################################
-[init_launch_agent]
-
-mkdir #{home}/Library/LaunchAgents/
-
-
 #######################################
 [mysql]
 
 PATH=$PATH:/usr/local/bin
+
 USER_HOME='#{node.home}'
 
-USER='#{mysql.user}'
-PASSWORD='#{mysql.password}'
+MYSQL_USER='#{mysql.user}'
+MYSQL_PASSWORD='#{mysql.password}'
 
 brew install mysql
 
@@ -64,8 +61,8 @@ mkdir -p $USER_HOME/Library/LaunchAgents
 
 sudo ln -sfv /usr/local/opt/mysql/*.plist $USER_HOME/Library/LaunchAgents
 
-mysqladmin -u$USER password $PASSWORD
-
+mysqladmin -u$MYSQL_USER password $MYSQL_PASSWORD
+#mysqladmin -u$MYSQL_USER -p$MYSQL_PASSWORD
 
 #######################################
 [mysql_restart]
@@ -170,11 +167,12 @@ PATH=$PATH:/usr/local/bin
 
 HOST_NAME='#{mysql.hostname}'
 APP_USER='#{mysql.app_user}'
-USER='#{mysql.user}'
-PASSWORD='#{mysql.password}'
+MYSQL_USER='#{mysql.user}'
+MYSQL_PASSWORD='#{mysql.password}'
+
+mysql -h $HOST_NAME -u$MYSQL_USER -p$MYSQL_PASSWORD -e "CREATE USER '$APP_USER'@'$HOST_NAME' IDENTIFIED BY '$APP_USER';"
+mysql -h $HOST_NAME -u$MYSQL_USER -p$MYSQL_PASSWORD -e "GRANT ALL PRIVILEGES ON *.* to '$APP_USER'@'$HOST_NAME' IDENTIFIED BY '$APP_USER' WITH GRANT OPTION;"
 
-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]
@@ -197,11 +195,10 @@ PATH=$PATH:/usr/local/bin
 SCHEMA='#{schema}'
 
 HOST_NAME='#{mysql.hostname}'
-USER='#{mysql.user}'
-PASSWORD='#{mysql.password}'
-APP_USER='#{mysql.app_user}'
+MYSQL_USER='#{mysql.user}'
+MYSQL_PASSWORD='#{mysql.password}'
 
-mysql -h $HOST_NAME -u$USER -p$PASSWORD -e "create database $SCHEMA;"
+mysql -h $HOST_NAME -u$MYSQL_USER -p$MYSQL_PASSWORD -e "create database $SCHEMA;"
 
 
 #######################################
@@ -212,11 +209,10 @@ PATH=$PATH:/usr/local/bin
 SCHEMA='#{schema}'
 
 HOST_NAME='#{mysql.hostname}'
-USER='#{mysql.user}'
-PASSWORD='#{mysql.password}'
-APP_USER='#{mysql.app_user}'
+MYSQL_USER='#{mysql.user}'
+MYSQL_PASSWORD='#{mysql.password}'
 
-mysql -h $HOST_NAME -u$USER -p$PASSWORD -e "drop database $SCHEMA;"
+mysql -h $HOST_NAME -u$MYSQL_USER -p$MYSQL_PASSWORD -e "drop database $SCHEMA;"
 
 
 #######################################

data/lib/osx_provision/version.rb

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

data/thor/osx_install.thor

@@ -9,27 +9,29 @@ class OsxInstall < Thor
     attr_reader :installer
   end
 
-  desc "all", "Installs all required packages"
-  def all
+  desc "general", "Installs general packages"
+  def general
+    invoke :prepare
+
     invoke :brew
-    invoke :rvm
     invoke :qt
 
-    invoke :mysql
-    invoke :mysql_restart
-
-    invoke :init_launch_agent
+    invoke :rvm
+    invoke :ruby
 
+    invoke :mysql
     invoke :postgres
-    invoke :postgres_restart
-
     invoke :jenkins
-    invoke :jenkins_restart
-
     invoke :selenium
 
-    invoke :ruby
+    invoke :mysql_restart
+    invoke :postgres_restart
+    invoke :jenkins_restart
+    invoke :selenium_restart
+  end
 
+  desc "app", "Installs app"
+  def app
     invoke :postgres_create_user
     invoke :postgres_create_schemas
 
@@ -37,6 +39,12 @@ class OsxInstall < Thor
     invoke :mysql_create_schemas
   end
 
+  desc "all", "Installs all required packages"
+  def all
+    invoke :general
+    invoke :app
+  end
+
   desc "postgres_create_schemas", "Initializes postgres schemas"
   def postgres_create_schemas
     OsxInstall.installer.postgres_create_schemas

metadata

@@ -1,97 +1,110 @@
 --- !ruby/object:Gem::Specification
 name: osx_provision
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
+  prerelease: 
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: text-interpolator
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: script_executor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.19'
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: gemspec_deps_gen
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: gemcutter
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
 description: Library for building Mac OSX computer provisioning
@@ -100,10 +113,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".osx_provision.json"
-- ".ruby-gemset"
-- ".ruby-version"
+- .gitignore
+- .osx_provision.json
+- .ruby-gemset
+- .ruby-version
 - CHANGES
 - Gemfile
 - LICENSE
@@ -123,26 +136,27 @@ 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: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Library for building Mac OSX provisioning
 test_files:
 - spec/osx_provision_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: e8a6f0c727bfe2456a12a469d9f01a94b4149062
-  data.tar.gz: 6d6fbd395803b7c2697daacecc1551f31f89c405
-SHA512:
-  metadata.gz: 45f6ab87c51f79049a231139610e53ce47a7b09638a8e2f514c3476b6d3c2dda09ef10b089d0b566b6a737af07706372d779ca340bf75fafbfd1502e9d059e4e
-  data.tar.gz: 706542524a790db5c9c5a7acd729f885a5513ef04b29b6361b2c5a424a5dbc49fa76753891b73bcb34d435db3ea0736ef63e1c95d3efeb8df879675b3c52fc8b