osx_provision 0.9.8 → 0.9.9

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MmQxMzkyM2Y4YTI4Yzg3ZWFmMTFiZjc3ZTI4MWRjMzAzMTQzNjVmOQ==
-  data.tar.gz: !binary |-
-    MDkyODdiNGQzYTA0ZDNkYWJjZTEzZjc3YjdmZjVmZDg0NTU0ZGRhYg==
+SHA1:
+  metadata.gz: f6bf8392a92c9d78597f946d340db3c75738a05f
+  data.tar.gz: 3e426f4a2bed3f7bf2cb74a97e1533d740c16192
 SHA512:
-  metadata.gz: !binary |-
-    NzQxNWMxYmVhZmM1MjI1ZDY4N2I3YjI4OTVkYmQ0NjZkMThhZTlkYTc5YmFj
-    YjU4MDYxYjIyZGZlMjdmOGI3ODcwN2ZiYzExMjE2NGE1YjI2MTkzNGNjOWM3
-    MzllZGE1ZGI1MTIzNjk4YWIwMWQ4ZWYwODhjNzMzM2MyZTIwN2E=
-  data.tar.gz: !binary |-
-    Y2E4YzAzM2QyYmVlYmQ1ZGVjNWY3YzFhOWQzYWQ5NWFjZGVkNDgwMjBlMGUy
-    MzIzZDNjYWM0MDZlMGM0NDE4ODAwMzYwZmE1ZTUzYzc0MDMyZmNhMWJlMjg0
-    MDYwMDRhMDBhYTZkN2JlYzU1NWE3OGVjMjMzNWQzZjBmNmY5YTc=
+  metadata.gz: 28084e95a44221174c5d0774968f64d2900d4e683acb34eab041912c342f53874ed1b3f1babec29106b8bda7a01d9ac861b07c8dee1b9960826b922e1456fa68
+  data.tar.gz: b48cece432160b5f0c5ef27b52ad5126765c06f5355962c406fece452fc898513a42f5f3657fa10d084ead89aa177b47b9acd1005fddca025f5b2aa786b3fe22

data/.osx_provision.json

@@ -10,7 +10,7 @@
   "project": {
     "home": "#{node.home}/osx_provision/demo",
     "ruby_version": "1.9.3",
-    "gemset": "osx_provision"
+    "gemset": "osx_provision_demo"
   },
 
   "postgres": {

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3
+2.2.2

data/CHANGES

@@ -34,4 +34,8 @@
 
 == Version 0.9.8
 
-* Bump script_executor version.
+* Bump script_executor version.
+
+== Version 0.9.8
+
+* Update scripts.

data/Gemfile

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

data/README.md

@@ -1,6 +1,6 @@
 OSX Provision
 
-Library and thor tasks for provisioning of Macbook computer initial setup for Ruby/Rails development
+Library and thor tasks for provisioning of MacBook computer initial setup for Ruby/Rails development
 
 Add this line to your application's Gemfile:
 
@@ -35,7 +35,7 @@ or separately:
 ```bash
 thor osx_install:brew
 thor osx_install:rvm
-thor osx_install:qtpostgres
+thor osx_install:postgres
 thor osx_install:brew
 ```
 

data/lib/osx_provision/osx_provision.rb

@@ -9,11 +9,9 @@ class OsxProvision < BaseProvision
     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
+    run(server_info, "prepare", env)
+  end
 
   def brew
     installed = package_installed("#{USER_LOCAL_BIN}/brew")

data/lib/osx_provision/osx_provision_scripts.sh

@@ -2,6 +2,7 @@
 
 #######################################
 [prepare]
+# Initial work
 
 #xcodebuild -license
 
@@ -10,6 +11,7 @@ mkdir #{home}/Library/LaunchAgents/
 
 #######################################
 [brew]
+# Installs homebrew
 
 ruby -e "$(curl -fsSL https://raw.github.com/Homebrew/homebrew/go/install)"
 
@@ -20,8 +22,33 @@ brew tap homebrew/dupes
 brew tap homebrew/versions
 
 
+#######################################
+[brew_cask]
+
+PATH=$PATH:/usr/local/bin
+
+brew install caskroom/cask/brew-cask
+
+
+#######################################
+[cask_apps]
+
+PATH=$PATH:/usr/local/bin
+
+brew cask install firefox
+brew cask install google-chrome
+brew cask install flux
+brew cask install iterm2
+brew cask install jenkins-menu
+brew cask install sublime-text3
+brew cask install unrarx
+brew cask install iterm2
+brew cask install vlc
+
+
 #######################################
 [rvm]
+# Installs rvm
 
 PATH=$PATH:/usr/local/bin
 USER_HOME="#{node.home}"
@@ -33,12 +60,63 @@ source $USER_HOME/.rvm/scripts/rvm
 
 #######################################
 [git]
+# Installs git
+
+PATH=$PATH:/usr/local/bin
 
 brew install git
 
 
+#######################################
+[svn]
+# Installs svn
+
+PATH=$PATH:/usr/local/bin
+
+brew install svn
+
+
+#######################################
+[ruby]
+# Installs ruby
+
+PATH=$PATH:/usr/local/bin
+
+rvm install 1.9.3
+
+
+#######################################
+[node]
+# Installs node
+
+brew install node
+
+
+#######################################
+[jenkins]
+
+PATH=$PATH:/usr/local/bin
+USER_HOME="#{node.home}"
+
+brew install jenkins
+
+ln -sfv /usr/local/opt/jenkins/homebrew.mxcl.jenkins.plist $USER_HOME/Library/LaunchAgents
+
+
+#######################################
+[selenium]
+
+PATH=$PATH:/usr/local/bin
+USER_HOME="#{node.home}"
+
+brew install selenium-server-standalone
+
+ln -sfv /usr/local/opt/selenium-server-standalone/*.plist $USER_HOME/Library/LaunchAgents
+
+
 #######################################
 [qt]
+# Installs qt
 
 PATH=$PATH:/usr/local/bin
 
@@ -47,6 +125,7 @@ brew install qt
 
 #######################################
 [mysql]
+# Installs mysql server
 
 PATH=$PATH:/usr/local/bin
 
@@ -66,6 +145,7 @@ mysqladmin -u$MYSQL_USER password $MYSQL_PASSWORD
 
 #######################################
 [mysql_restart]
+# Restarts mysql server
 
 STARTED='[#{started}]'
 USER_HOME='#{node.home}'
@@ -79,6 +159,7 @@ launchctl load $USER_HOME/Library/LaunchAgents/homebrew.mxcl.mysql.plist
 
 #######################################
 [postgres]
+# Installs postgresql server
 
 PATH=$PATH:/usr/local/bin
 USER_HOME="#{node.home}"
@@ -89,25 +170,32 @@ ln -sfv /usr/local/opt/postgresql/homebrew.mxcl.postgresql.plist $USER_HOME/Libr
 
 initdb /usr/local/var/postgres -E utf8
 
+mkdir /var/pgsql_socket/
+ln -s /private/tmp/.s.PGSQL.5432 /var/pgsql_socket/
+
 
 #######################################
-[postgres_stop]
+[postgres_start]
+# Starts postgresql server
 
 USER_HOME="#{node.home}"
 
-launchctl unload -w $USER_HOME/Library/LaunchAgents/homebrew.mxcl.postgresql.plist
+launchctl load -w $USER_HOME/Library/LaunchAgents/homebrew.mxcl.postgresql.plist
 
 
 #######################################
-[postgres_start]
+[postgres_stop]
+# Stops postgresql server
 
 USER_HOME="#{node.home}"
 
-launchctl load -w $USER_HOME/Library/LaunchAgents/homebrew.mxcl.postgresql.plist
+launchctl unload -w $USER_HOME/Library/LaunchAgents/homebrew.mxcl.postgresql.plist
+
 
 
 #######################################
 [postgres_restart]
+# Restarts postgresql server
 
 STARTED="[#{started}]"
 USER_HOME="#{node.home}"
@@ -121,6 +209,7 @@ launchctl load -w $USER_HOME/Library/LaunchAgents/homebrew.mxcl.postgresql.plist
 
 #######################################
 [postgres_create_user]
+# Creates postgres user
 
 PATH=$PATH:/usr/local/bin
 
@@ -130,38 +219,42 @@ createuser -s -d -r $APP_USER
 
 
 #######################################
-[postgres_create_schema]
+[postgres_drop_user]
+# Drops postgres user
 
 PATH=$PATH:/usr/local/bin
 
 APP_USER='#{postgres.app_user}'
-SCHEMA='#{schema}'
 
-createdb -U $APP_USER $SCHEMA
+dropuser $APP_USER
 
 
 #######################################
-[postgres_drop_schema]
+[postgres_create_schema]
+# Creates postgres schema
 
 PATH=$PATH:/usr/local/bin
 
+APP_USER='#{postgres.app_user}'
 SCHEMA='#{schema}'
 
-dropdb $SCHEMA
+createdb -U $APP_USER $SCHEMA
 
 
 #######################################
-[postgres_drop_user]
+[postgres_drop_schema]
+# Drops postgres schema`
 
 PATH=$PATH:/usr/local/bin
 
-APP_USER='#{postgres.app_user}'
+SCHEMA='#{schema}'
 
-dropuser $APP_USER
+dropdb $SCHEMA
 
 
 #######################################
 [mysql_create_user]
+# Creates mysql user
 
 PATH=$PATH:/usr/local/bin
 
@@ -176,6 +269,7 @@ mysql -h $HOST_NAME -u$MYSQL_USER -p$MYSQL_PASSWORD -e "GRANT ALL PRIVILEGES ON
 
 #######################################
 [mysql_drop_user]
+# Drops mysql user
 
 PATH=$PATH:/usr/local/bin
 
@@ -189,6 +283,7 @@ mysql -h $HOST_NAME -u$USER -p$PASSWORD -e "DROP USER '$APP_USER'@'$HOST_NAME';"
 
 #######################################
 [mysql_create_schema]
+# Creates mysql schema
 
 PATH=$PATH:/usr/local/bin
 
@@ -203,6 +298,7 @@ mysql -h $HOST_NAME -u$MYSQL_USER -p$MYSQL_PASSWORD -e "create database $SCHEMA;
 
 #######################################
 [mysql_drop_schema]
+# Drops mysql schema
 
 PATH=$PATH:/usr/local/bin
 
@@ -215,25 +311,6 @@ MYSQL_PASSWORD='#{mysql.password}'
 mysql -h $HOST_NAME -u$MYSQL_USER -p$MYSQL_PASSWORD -e "drop database $SCHEMA;"
 
 
-#######################################
-[ruby]
-
-PATH=$PATH:/usr/local/bin
-
-rvm install 1.9.3
-
-
-#######################################
-[jenkins]
-
-PATH=$PATH:/usr/local/bin
-USER_HOME="#{node.home}"
-
-brew install jenkins
-
-ln -sfv /usr/local/opt/jenkins/homebrew.mxcl.jenkins.plist $USER_HOME/Library/LaunchAgents
-
-
 #######################################
 [jenkins_restart]
 
@@ -247,17 +324,6 @@ fi
 launchctl load $USER_HOME/Library/LaunchAgents/homebrew.mxcl.jenkins.plist
 
 
-#######################################
-[selenium]
-
-PATH=$PATH:/usr/local/bin
-USER_HOME="#{node.home}"
-
-brew install selenium-server-standalone
-
-ln -sfv /usr/local/opt/selenium-server-standalone/*.plist $USER_HOME/Library/LaunchAgents
-
-
 #######################################
 [selenium_restart]
 
@@ -271,12 +337,6 @@ fi
 launchctl load $USER_HOME/Library/LaunchAgents/homebrew.mxcl.selenium-server-standalone.plist
 
 
-#######################################
-[npm]
-
-brew install node
-
-
 #######################################
 [package_installed]
 

data/lib/osx_provision/version.rb

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

data/osx_provision.gemspec

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

data/spec/osx_provision_spec.rb

@@ -1,25 +1,23 @@
 require File.expand_path('spec_helper', File.dirname(__FILE__))
 
-require 'osx_provision/osx_provision'
+require 'osx_provision'
 
-describe OsxProvision do
-  subject { OsxPrivision.new ".osx_provision.json", "osx_provision_scripts.sh"}
+RSpec.describe OsxProvision do
+  subject { OsxProvision.new self.class, ".osx_provision.json" }
 
-  describe "#init_launch_agent" do
+  describe "#prepare" do
     it "calls prepare method" do
-      subject.jenkins_install
-    end
-  end
+      expect(subject).to receive(:run)
 
-  describe "#init_launch_agent" do
-    it "calls init_launch_agent method" do
-      subject.init_launch_agent
+      subject.prepare
     end
   end
 
   describe "#homebrew_install" do
     it "calls homebrew_install method" do
-      subject.homebrew_install
+      expect(subject).to receive(:run)
+
+      subject.brew
     end
   end
 end

data/spec/spec_helper.rb

@@ -1 +1 @@
-$: << File.expand_path('../lib', File.dirname(__FILE__))
+$: << File.expand_path('../lib', File.dirname(__FILE__))

data/thor/osx_install.thor

@@ -3,7 +3,7 @@ $: << File.expand_path(File.dirname(__FILE__) + '/../lib')
 require 'osx_provision/osx_provision'
 
 class OsxInstall < Thor
-  @installer = OsxProvision.new self, ".osx_provision.json", [File.expand_path("project_scripts.sh", File.dirname(__FILE__))]
+  @installer = OsxProvision.new self, ".osx_provision.json"
 
   class << self
     attr_reader :installer
@@ -21,8 +21,6 @@ class OsxInstall < Thor
 
     invoke :mysql
     invoke :postgres
-    invoke :jenkins
-    invoke :selenium
 
     invoke :mysql_restart
     invoke :postgres_restart
@@ -30,8 +28,16 @@ class OsxInstall < Thor
     invoke :selenium_restart
   end
 
-  desc "app", "Installs app"
-  def app
+  desc "special", "Installs special packages"
+  def special
+    invoke :node
+    invoke :jenkins
+
+    invoke :selenium
+  end
+
+  desc "create_env", "Installs environment"
+  def create_env
     invoke :postgres_create_user
     invoke :postgres_create_schemas
 
@@ -39,10 +45,20 @@ class OsxInstall < Thor
     invoke :mysql_create_schemas
   end
 
+  desc "delete_env", "Deletes environment"
+  def delete_env
+    invoke :postgres_drop_schemas
+    invoke :postgres_drop_user
+
+    invoke :mysql_drop_schemas
+    invoke :mysql_drop_user
+  end
+
   desc "all", "Installs all required packages"
   def all
     invoke :general
-    invoke :app
+    invoke :special
+    invoke :create_env
   end
 
   desc "postgres_create_schemas", "Initializes postgres schemas"

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: osx_provision
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2015-05-14 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'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: script_executor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !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,10 +100,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
@@ -119,7 +119,6 @@ files:
 - spec/osx_provision_spec.rb
 - spec/spec_helper.rb
 - thor/osx_install.thor
-- thor/project_scripts.sh
 homepage: http://github.com/shvets/osx_provision
 licenses: []
 metadata: {}
@@ -129,17 +128,17 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Library for building Mac OSX provisioning

data/thor/project_scripts.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-[project]
-
-echo "hello!"