osx_provision 0.9.6 → 0.9.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. data/CHANGES +5 -1
  2. data/lib/osx_provision/osx_provision_scripts.sh +19 -23
  3. data/lib/osx_provision/version.rb +1 -1
  4. data/thor/osx_install.thor +20 -12
  5. metadata +37 -23
  6. checksums.yaml +0 -7
data/CHANGES CHANGED
@@ -26,4 +26,8 @@
26
26
 
27
27
  == Version 0.9.6
28
28
 
29
- * Expose script methods as thor tasks.
29
+ * Expose script methods as thor tasks.
30
+
31
+ == Version 0.9.7
32
+
33
+ * Bug fix.
data/lib/osx_provision/osx_provision_scripts.sh CHANGED
@@ -3,7 +3,9 @@
3
3
  #######################################
4
4
  [prepare]
5
5
 
6
- xcodebuild -license
6
+ #xcodebuild -license
7
+
8
+ mkdir #{home}/Library/LaunchAgents/
7
9
 
8
10
 
9
11
  #######################################
@@ -43,20 +45,15 @@ PATH=$PATH:/usr/local/bin
43
45
  brew install qt
44
46
 
45
47
 
46
- #######################################
47
- [init_launch_agent]
48
-
49
- mkdir #{home}/Library/LaunchAgents/
50
-
51
-
52
48
  #######################################
53
49
  [mysql]
54
50
 
55
51
  PATH=$PATH:/usr/local/bin
52
+
56
53
  USER_HOME='#{node.home}'
57
54
 
58
- USER='#{mysql.user}'
59
- PASSWORD='#{mysql.password}'
55
+ MYSQL_USER='#{mysql.user}'
56
+ MYSQL_PASSWORD='#{mysql.password}'
60
57
 
61
58
  brew install mysql
62
59
 
@@ -64,8 +61,8 @@ mkdir -p $USER_HOME/Library/LaunchAgents
64
61
 
65
62
  sudo ln -sfv /usr/local/opt/mysql/*.plist $USER_HOME/Library/LaunchAgents
66
63
 
67
- mysqladmin -u$USER password $PASSWORD
68
-
64
+ mysqladmin -u$MYSQL_USER password $MYSQL_PASSWORD
65
+ #mysqladmin -u$MYSQL_USER -p$MYSQL_PASSWORD
69
66
 
70
67
  #######################################
71
68
  [mysql_restart]
@@ -170,11 +167,12 @@ PATH=$PATH:/usr/local/bin
170
167
 
171
168
  HOST_NAME='#{mysql.hostname}'
172
169
  APP_USER='#{mysql.app_user}'
173
- USER='#{mysql.user}'
174
- PASSWORD='#{mysql.password}'
170
+ MYSQL_USER='#{mysql.user}'
171
+ MYSQL_PASSWORD='#{mysql.password}'
172
+
173
+ mysql -h $HOST_NAME -u$MYSQL_USER -p$MYSQL_PASSWORD -e "CREATE USER '$APP_USER'@'$HOST_NAME' IDENTIFIED BY '$APP_USER';"
174
+ 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;"
175
175
 
176
- mysql -h $HOST_NAME -u$USER -p$PASSWORD -e "CREATE USER '$APP_USER'@'$HOST_NAME' IDENTIFIED BY '$APP_USER';"
177
- 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;"
178
176
 
179
177
  #######################################
180
178
  [mysql_drop_user]
@@ -197,11 +195,10 @@ PATH=$PATH:/usr/local/bin
197
195
  SCHEMA='#{schema}'
198
196
 
199
197
  HOST_NAME='#{mysql.hostname}'
200
- USER='#{mysql.user}'
201
- PASSWORD='#{mysql.password}'
202
- APP_USER='#{mysql.app_user}'
198
+ MYSQL_USER='#{mysql.user}'
199
+ MYSQL_PASSWORD='#{mysql.password}'
203
200
 
204
- mysql -h $HOST_NAME -u$USER -p$PASSWORD -e "create database $SCHEMA;"
201
+ mysql -h $HOST_NAME -u$MYSQL_USER -p$MYSQL_PASSWORD -e "create database $SCHEMA;"
205
202
 
206
203
 
207
204
  #######################################
@@ -212,11 +209,10 @@ PATH=$PATH:/usr/local/bin
212
209
  SCHEMA='#{schema}'
213
210
 
214
211
  HOST_NAME='#{mysql.hostname}'
215
- USER='#{mysql.user}'
216
- PASSWORD='#{mysql.password}'
217
- APP_USER='#{mysql.app_user}'
212
+ MYSQL_USER='#{mysql.user}'
213
+ MYSQL_PASSWORD='#{mysql.password}'
218
214
 
219
- mysql -h $HOST_NAME -u$USER -p$PASSWORD -e "drop database $SCHEMA;"
215
+ mysql -h $HOST_NAME -u$MYSQL_USER -p$MYSQL_PASSWORD -e "drop database $SCHEMA;"
220
216
 
221
217
 
222
218
  #######################################
data/lib/osx_provision/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  class OsxProvision
2
- VERSION = "0.9.6"
2
+ VERSION = "0.9.7"
3
3
  end
data/thor/osx_install.thor CHANGED
@@ -9,27 +9,29 @@ class OsxInstall < Thor
9
9
  attr_reader :installer
10
10
  end
11
11
 
12
- desc "all", "Installs all required packages"
13
- def all
12
+ desc "general", "Installs general packages"
13
+ def general
14
+ invoke :prepare
15
+
14
16
  invoke :brew
15
- invoke :rvm
16
17
  invoke :qt
17
18
 
18
- invoke :mysql
19
- invoke :mysql_restart
20
-
21
- invoke :init_launch_agent
19
+ invoke :rvm
20
+ invoke :ruby
22
21
 
22
+ invoke :mysql
23
23
  invoke :postgres
24
- invoke :postgres_restart
25
-
26
24
  invoke :jenkins
27
- invoke :jenkins_restart
28
-
29
25
  invoke :selenium
30
26
 
31
- invoke :ruby
27
+ invoke :mysql_restart
28
+ invoke :postgres_restart
29
+ invoke :jenkins_restart
30
+ invoke :selenium_restart
31
+ end
32
32
 
33
+ desc "app", "Installs app"
34
+ def app
33
35
  invoke :postgres_create_user
34
36
  invoke :postgres_create_schemas
35
37
 
@@ -37,6 +39,12 @@ class OsxInstall < Thor
37
39
  invoke :mysql_create_schemas
38
40
  end
39
41
 
42
+ desc "all", "Installs all required packages"
43
+ def all
44
+ invoke :general
45
+ invoke :app
46
+ end
47
+
40
48
  desc "postgres_create_schemas", "Initializes postgres schemas"
41
49
  def postgres_create_schemas
42
50
  OsxInstall.installer.postgres_create_schemas
metadata CHANGED
@@ -1,97 +1,110 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: osx_provision
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.6
4
+ version: 0.9.7
5
+ prerelease:
5
6
  platform: ruby
6
7
  authors:
7
8
  - Alexander Shvets
8
9
  autorequire:
9
10
  bindir: bin
10
11
  cert_chain: []
11
- date: 2014-06-25 00:00:00.000000000 Z
12
+ date: 2014-06-26 00:00:00.000000000 Z
12
13
  dependencies:
13
14
  - !ruby/object:Gem::Dependency
14
15
  name: text-interpolator
15
16
  requirement: !ruby/object:Gem::Requirement
17
+ none: false
16
18
  requirements:
17
- - - "~>"
19
+ - - ~>
18
20
  - !ruby/object:Gem::Version
19
21
  version: '1.0'
20
22
  type: :runtime
21
23
  prerelease: false
22
24
  version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
23
26
  requirements:
24
- - - "~>"
27
+ - - ~>
25
28
  - !ruby/object:Gem::Version
26
29
  version: '1.0'
27
30
  - !ruby/object:Gem::Dependency
28
31
  name: script_executor
29
32
  requirement: !ruby/object:Gem::Requirement
33
+ none: false
30
34
  requirements:
31
- - - "~>"
35
+ - - ~>
32
36
  - !ruby/object:Gem::Version
33
37
  version: '1.4'
34
38
  type: :runtime
35
39
  prerelease: false
36
40
  version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
37
42
  requirements:
38
- - - "~>"
43
+ - - ~>
39
44
  - !ruby/object:Gem::Version
40
45
  version: '1.4'
41
46
  - !ruby/object:Gem::Dependency
42
47
  name: thor
43
48
  requirement: !ruby/object:Gem::Requirement
49
+ none: false
44
50
  requirements:
45
- - - "~>"
51
+ - - ~>
46
52
  - !ruby/object:Gem::Version
47
53
  version: '0.19'
48
54
  type: :runtime
49
55
  prerelease: false
50
56
  version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
51
58
  requirements:
52
- - - "~>"
59
+ - - ~>
53
60
  - !ruby/object:Gem::Version
54
61
  version: '0.19'
55
62
  - !ruby/object:Gem::Dependency
56
63
  name: json_pure
57
64
  requirement: !ruby/object:Gem::Requirement
65
+ none: false
58
66
  requirements:
59
- - - "~>"
67
+ - - ~>
60
68
  - !ruby/object:Gem::Version
61
69
  version: '1.8'
62
70
  type: :runtime
63
71
  prerelease: false
64
72
  version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
65
74
  requirements:
66
- - - "~>"
75
+ - - ~>
67
76
  - !ruby/object:Gem::Version
68
77
  version: '1.8'
69
78
  - !ruby/object:Gem::Dependency
70
79
  name: gemspec_deps_gen
71
80
  requirement: !ruby/object:Gem::Requirement
81
+ none: false
72
82
  requirements:
73
- - - "~>"
83
+ - - ~>
74
84
  - !ruby/object:Gem::Version
75
85
  version: '1.1'
76
86
  type: :development
77
87
  prerelease: false
78
88
  version_requirements: !ruby/object:Gem::Requirement
89
+ none: false
79
90
  requirements:
80
- - - "~>"
91
+ - - ~>
81
92
  - !ruby/object:Gem::Version
82
93
  version: '1.1'
83
94
  - !ruby/object:Gem::Dependency
84
95
  name: gemcutter
85
96
  requirement: !ruby/object:Gem::Requirement
97
+ none: false
86
98
  requirements:
87
- - - "~>"
99
+ - - ~>
88
100
  - !ruby/object:Gem::Version
89
101
  version: '0.7'
90
102
  type: :development
91
103
  prerelease: false
92
104
  version_requirements: !ruby/object:Gem::Requirement
105
+ none: false
93
106
  requirements:
94
- - - "~>"
107
+ - - ~>
95
108
  - !ruby/object:Gem::Version
96
109
  version: '0.7'
97
110
  description: Library for building Mac OSX computer provisioning
@@ -100,10 +113,10 @@ executables: []
100
113
  extensions: []
101
114
  extra_rdoc_files: []
102
115
  files:
103
- - ".gitignore"
104
- - ".osx_provision.json"
105
- - ".ruby-gemset"
106
- - ".ruby-version"
116
+ - .gitignore
117
+ - .osx_provision.json
118
+ - .ruby-gemset
119
+ - .ruby-version
107
120
  - CHANGES
108
121
  - Gemfile
109
122
  - LICENSE
@@ -123,26 +136,27 @@ files:
123
136
  - thor/project_scripts.sh
124
137
  homepage: http://github.com/shvets/osx_provision
125
138
  licenses: []
126
- metadata: {}
127
139
  post_install_message:
128
140
  rdoc_options: []
129
141
  require_paths:
130
142
  - lib
131
143
  required_ruby_version: !ruby/object:Gem::Requirement
144
+ none: false
132
145
  requirements:
133
- - - ">="
146
+ - - ! '>='
134
147
  - !ruby/object:Gem::Version
135
148
  version: '0'
136
149
  required_rubygems_version: !ruby/object:Gem::Requirement
150
+ none: false
137
151
  requirements:
138
- - - ">="
152
+ - - ! '>='
139
153
  - !ruby/object:Gem::Version
140
154
  version: '0'
141
155
  requirements: []
142
156
  rubyforge_project:
143
- rubygems_version: 2.2.2
157
+ rubygems_version: 1.8.23
144
158
  signing_key:
145
- specification_version: 4
159
+ specification_version: 3
146
160
  summary: Library for building Mac OSX provisioning
147
161
  test_files:
148
162
  - spec/osx_provision_spec.rb
checksums.yaml DELETED
@@ -1,7 +0,0 @@
1
- ---
2
- SHA1:
3
- metadata.gz: e8a6f0c727bfe2456a12a469d9f01a94b4149062
4
- data.tar.gz: 6d6fbd395803b7c2697daacecc1551f31f89c405
5
- SHA512:
6
- metadata.gz: 45f6ab87c51f79049a231139610e53ce47a7b09638a8e2f514c3476b6d3c2dda09ef10b089d0b566b6a737af07706372d779ca340bf75fafbfd1502e9d059e4e
7
- data.tar.gz: 706542524a790db5c9c5a7acd729f885a5513ef04b29b6361b2c5a424a5dbc49fa76753891b73bcb34d435db3ea0736ef63e1c95d3efeb8df879675b3c52fc8b