Merge pull request #45 from XhmikosR/master

Update libraries

Author: emachnic

CHANGELOG.txt

@@ -1,3 +1,5 @@
+2.2.3 - Ruby 1.9.3-p545, Rails 3.2.18, git 1.9.2, postgresql-9.3.4-3, sqlite 3.8.4.3, mysql-5.6.17
+
 2.2.2 - Ruby 1.9.3-p484, Rails 3.2.16, git 1.8.4, postgresql-9.3.2-1, sqlite 3.8.2, mysql-5.6.15
 
 2.2.0 - Updated main components to the latest version (Ruby 1.9.3-p362,

README.md

@@ -18,31 +18,34 @@ built and packaged via rake tasks.
 
 1. Download and install latest
    [Inno Setup Quick Start Pack](http://www.jrsoftware.org/isdl.php#qsp),
-   add iscc.exe is in your PATH
+   add iscc.exe in your PATH
 
-1. [Fork](http://help.github.com/fork-a-repo/)
+1. [Fork](https://help.github.com/articles/fork-a-repo)
    the [RailsInstaller project on github](https://github.com/railsinstaller/railsinstaller-windows.git)
-   into your own github account.
+   into your own GitHub account.
 
 1. Open the the command prompt from the start menu and change directory to where you like to keep your projects.
 
 1. Clone your fork of the project.
 
-    > git clone git@github.com:{{your github user name}}/railsinstaller-windows
-
-    > cd railsinstaller-windows
+    ```bash
+    git clone https://github.com/{{your GitHub user name}}/railsinstaller-windows.git
+    cd railsinstaller-windows
+    ```
 
 1. Update from origin master (or 2.0.0) branch and checkout a new topic branch for your feature/bugfix.
 
-    > git checkout master
-
-    > git pull origin master
-
-    > git checkout -b mybranchname
+    ```bash
+    git checkout master
+    git pull origin master
+    git checkout -b mybranchname
+    ```
 
 1. Bootstrap the project. From the project root run:
 
-    > rake bootstrap
+    ```bash
+    rake bootstrap
+    ```
 
 1. Implement your new feature and/or fix your bug in your newly forked Railsinstaller project code.
 
@@ -54,24 +57,29 @@ built and packaged via rake tasks.
 
 1. Next build all components onto the stage (into the stage/ directory)
 
-    > rake build
+    ```bash
+    rake build
+    ```
 
 1. Use Inno Setup to package the installer into an executable (.exe) for testing/distribution.
 
-    > SET PATH=C:\Program Files\Inno Setup 5;%PATH%
-    > rake package
+    ```bat
+    SET PATH=C:\Program Files\Inno Setup 5;%PATH%
+    rake package
+    ```
 
   * This creates the executable (.exe) package file in the pkg/ directory from the files staged during the build process in the stage/ directory.
 
   * NOTE - You can run the package task with --trace for debugging output if the package fails to build or if you simply want to see what is being done as it is done).
 
 1. Once you have verified your new feature/bug-fix, push your branch up to GitHub.
 
-    > git commit -a -m "Implemented featureX/bugfixX which <description>..."
-
-    > git push origin mybranchname
+    ```bash
+    git commit -a -m "Implemented featureX/bugfixX which <description>..."
+    git push origin mybranchname
+    ```
 
-1. Now issue a [pull request](http://help.github.com/pull-requests/) on GitHub.
+1. Now issue a [pull request](https://help.github.com/articles/using-pull-requests) on GitHub.
 
 # RailsInstaller Components
 

VERSION.txt

@@ -1 +1 @@
-2.2.2
+2.2.3

config/railsinstaller.yml

@@ -7,7 +7,7 @@
     - rake
     -
       :name: rails
-      :version: "3.2.16"
+      :version: "3.2.18"
     -
       :name: activerecord-sqlserver-adapter
       :version: "3.2.12"
@@ -40,14 +40,14 @@
   :title: Ruby 1.9.3
   :name: Ruby193
   :regex: '^.*$'
-  :url: "http://s3.amazonaws.com/railsinstaller/Resources/ruby-1.9.3-p484-i386-mingw32.7z"
+  :url: "http://s3.amazonaws.com/railsinstaller/Resources/ruby-1.9.3-p545-i386-mingw32.7z"
   :rename: Ruby1.9.3
 
 :git:
   :category: component
-  :title: Git 1.8.4
+  :title: Git 1.9.2
   :name: Git
-  :url: "http://msysgit.googlecode.com/files/PortableGit-1.8.4-preview20130916.7z"
+  :url: "http://s3.amazonaws.com/railsinstaller/Resources/PortableGit-1.9.2-preview20140411.7z"
   :target: "Git"
   :regex: '^.*$'
 
@@ -71,7 +71,7 @@
     - msvcr90.dll
     - libxml2.dll
   :regex: '^.*$'
-  :url: "http://get.enterprisedb.com/postgresql/postgresql-9.3.2-1-windows-binaries.zip"
+  :url: "http://get.enterprisedb.com/postgresql/postgresql-9.3.4-3-windows-binaries.zip"
 
 :rails:
   :name: Rails
@@ -107,14 +107,14 @@
     - sqlite3.def
     - sqlite3.exe
   :regex: '^.+\.exe$'
-  :url: http://sqlite.org/2013/sqlite-shell-win32-x86-3080200.zip
+  :url: http://sqlite.org/2014/sqlite-shell-win32-x86-3080403.zip
 
 :sqlite3_dll:
   :name: Sqlite3Dll
   :title: Sqlite3 Dll
   :category: component
   :regex: '^.+\.dll$'
-  :url: http://sqlite.org/2013/sqlite-dll-win32-x86-3080200.zip
+  :url: http://sqlite.org/2014/sqlite-dll-win32-x86-3080403.zip
 
 :ssl_certificates:
   :name: SSLCertificates
@@ -136,11 +136,11 @@
   :name: MySQLServer
   :title: MySQL Community Server
   :category: component
-  :url: "http://mysql.mirrors.pair.com/Downloads/MySQL-5.6/mysql-5.6.15-winx64.zip"
+  :url: "http://mysql.mirrors.pair.com/Downloads/MySQL-5.6/mysql-5.6.17-winx64.zip"
   :regex: '^.*$'
   :urls:
-    - "http://mysql.mirrors.pair.com/Downloads/MySQL-5.6/mysql-5.6.15-winx64.zip"
-    - "http://mysql.mirrors.pair.com/Downloads/MySQL-5.6/mysql-5.6.15-win32.zip"
+    - "http://mysql.mirrors.pair.com/Downloads/MySQL-5.6/mysql-5.6.17-winx64.zip"
+    - "http://mysql.mirrors.pair.com/Downloads/MySQL-5.6/mysql-5.6.17-win32.zip"
 
 :bsdtar:
   :name: BSDTar

lib/railsinstaller.rb

@@ -15,15 +15,15 @@ module RailsInstaller # Ensure that the RailsInstaller project root is defined.
 
 %w[ globals ].each do |name|
   printf "Loading #{name}...\n" if $Flags[:verbose]
-  require File.expand_path(File.join(RailsInstaller::Root,"lib", "setup", name +'.rb'))
+  require File.expand_path(File.join(RailsInstaller::Root, "lib", "setup", name + '.rb'))
 end
 
 %w[ stdlib ].each do |name|
   printf "Loading #{name}...\n" if $Flags[:verbose]
-  require File.expand_path(File.join(RailsInstaller::Root,"lib", "extensions", name +'.rb'))
+  require File.expand_path(File.join(RailsInstaller::Root, "lib", "extensions", name + '.rb'))
 end
 
 %w[ components methods downloads actions ].each do |name|
   printf "Loading #{name}...\n" if $Flags[:verbose]
-  require File.expand_path(File.join(RailsInstaller::Root,"lib", "railsinstaller", name +'.rb'))
+  require File.expand_path(File.join(RailsInstaller::Root, "lib", "railsinstaller", name + '.rb'))
 end

lib/railsinstaller/methods.rb

@@ -13,8 +13,8 @@ def self.unzip(package)
     else
       target_path = File.join(base_path, package.target)
     end
-    regex     = Regexp.new(package.regex) unless package.regex.nil?
-    files     = []
+    regex = Regexp.new(package.regex) unless package.regex.nil?
+    files = []
 
     printf " => Extracting #{filename}\n"
 
@@ -73,8 +73,8 @@ def self.extract(package)
       else
         target_path = File.join(RailsInstaller::Stage, package.target)
       end
-      bsdtar      = File.join(RailsInstaller::Stage, "bin", RailsInstaller::BSDTar.binary)
-      sevenzip    = File.join(RailsInstaller::Stage, "bin", RailsInstaller::SevenZip.binary)
+      bsdtar   = File.join(RailsInstaller::Stage, "bin", RailsInstaller::BSDTar.binary)
+      sevenzip = File.join(RailsInstaller::Stage, "bin", RailsInstaller::SevenZip.binary)
 
       if package.category == "utility" &&
         File.exist?(File.join(RailsInstaller::Stage, "bin", package.binary))
@@ -133,7 +133,7 @@ def self.extract(package)
                 end
 
                 source = File.basename(package.url, File.extname(package.url))
-                printf "DEBUG: source: %s\ntarget: %s\n", source, package.rename
+                printf "DEBUG: source: %s\ntarget: %s\n", source, package.rename if $Flags[:verbose]
                 FileUtils.mv(
                   File.basename(package.url, File.extname(package.url)),
                   package.rename

resources/railsinstaller/railsinstaller.iss

@@ -88,7 +88,7 @@ Name: en; MessagesFile: compiler:Default.isl
 [Messages]
 en.InstallingLabel=Installing [name], this will take a few minutes...
 en.WelcomeLabel1=Welcome to [name]!
-en.WelcomeLabel2=This will install [name/ver] on your computer which includes Ruby 1.9.3, Rails 3.2.14, Git, Sqlite3, DevKit, and TinyTDS with FreeTDS.  Please close any console applications before continuing.
+en.WelcomeLabel2=This will install [name/ver] on your computer which includes Ruby 1.9.3, Rails 3.2.18, Git, Sqlite3, DevKit, and TinyTDS with FreeTDS.  Please close any console applications before continuing.
 en.WizardLicense={#InstallerName} License Agreement
 en.LicenseLabel=
 en.LicenseLabel3=Please read the following License Agreements and accept the terms before continuing the installation.