db-migrate 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9703746febda4f9b2ef4d5ad0a5013fd044d80f0
-  data.tar.gz: 396ff547f035d0ce68dc5093b9d441edbc93ba92
+  metadata.gz: eab419426da9f80e43140f1f4b25f5f56b7970e6
+  data.tar.gz: e2840d27dc6129e8aa4176100e87d60c1f3fa62b
 SHA512:
-  metadata.gz: 5568c7624e9b6685ec1099b87a1a395c41016e82b501a2499738e934b3fc197104023c79b6a5d6b806e25cadb001d0dd15b60b9782219840a729efc182c30855
-  data.tar.gz: 6f51e9a629a34023a42a50f30eed3ccaab4644de633a5148acdbc6cc236ff436ebd25d8d48af1d5a41916f87b57d16d3ee5d34cec67d59b6c27dd4d3d08a56cd
+  metadata.gz: 45ad601cb4e91159d8574972ad8db33f69f2d0690d9074b279228b1ce551aa47a61f50ca283b6ac5bde84e9d7f96b1cc5868c31720001b2828f1ea7a1e1117e6
+  data.tar.gz: cccb1098e5f70782fe3e471a82869245c08d294065337a3cc56f5e45b50bce6b69f9227a31ff59214ab9ab1994f9e4817e9bfc986e54063994107cd4766934db

data/Gemfile.lock

@@ -0,0 +1,50 @@
+PATH
+  remote: .
+  specs:
+    db-migrate (0.0.4)
+      colorize (= 0.7.7)
+      highline (= 1.7.8)
+      json (= 1.8.3)
+      parseconfig (= 1.0.6)
+      terminal-table (= 1.5.2)
+      thor (= 0.19.1)
+      wannabe_bool (= 0.5.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    colorize (0.7.7)
+    diff-lcs (1.2.5)
+    highline (1.7.8)
+    json (1.8.3)
+    mysql2 (0.4.2)
+    parseconfig (1.0.6)
+    pg (0.18.4)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.2)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    terminal-table (1.5.2)
+    thor (0.19.1)
+    wannabe_bool (0.5.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  db-migrate!
+  mysql2 (= 0.4.2)
+  pg (= 0.18.4)
+  rspec (= 3.4.0)
+
+BUNDLED WITH
+   1.11.2

data/README.md

@@ -51,31 +51,6 @@ Options:
 #### init
 First thing you have to do is to make initial configuration with **migrate init** command.
 
-**Demo:**
-```
-$ migrate init
-[INFO] Creating configuration...
-1. mysql
-2. pg
-Which database do you prefer?
-1
-1. sql
-2. ruby
-3. javascript
-4. go
-5. python
-What language would you like use for your migration scripts?
-1
-Host: |localhost| 
-Port: |3306| 
-Database Name: |mydb|     
-User: |root| 
-Password: password
-Version info table: |version_info| 
-Version number table: |version_number| 
-[SUCCESS] Configuration file created. Location: `./migrate.conf`
-```
-
 #### new
 After that you can start generating migrations by using **migrate new** command. This will generate migration script for you based on your prefered language.
 

data/bin/migrate

@@ -3,12 +3,16 @@
 require "thor"
 require "json"
 require "highline"
+require 'wannabe_bool'
 require_relative "../lib/migrate"
 
 include Migrate
 $asker = HighLine.new
 
 class CLI < Thor
+  @@pg_version = "0.18.4"
+  @@mysql_version = "0.4.2"
+
   method_option :root, {
     :aliases => "-r",
     :default => ".",
@@ -47,6 +51,29 @@ class CLI < Thor
       menu.choices(:pg) { storage = "pg" }
     end
 
+    install_dep = ""
+    case storage
+    when "pg"
+      if `gem list -i pg`.to_b != true
+        install_dep = "sudo gem install pg -v #{@@pg_version}"
+        Log.info "pg package not installed. Will install it."
+      end
+    when "mysql"
+      if `gem list -i mysql2`.to_b != "true"
+        install_dep = "sudo gem install mysql2 -v #{@@mysql_version}"
+        Log.info "mysql2 package not installed. Will install it."
+      end
+    end
+
+    unless install_dep.empty?
+      Log.info "Running '#{install_dep}'"
+      unless system(install_dep)
+        raise "Wrror while install dependencies. Please try to run '#{install_dep}' manually and try running 'init' again."
+      else
+        Log.info "Missing dependencies installed"
+      end
+    end
+
     db_defaults = case storage
     when "mysql"
       { :port => "3306", :user => "root" }
@@ -57,7 +84,7 @@ class CLI < Thor
     lang = nil
     $asker.choose do |menu|
       menu.prompt = "What language would you like use for your migration scripts?"
-      
+
       menu.choice(:sql) { lang = "sql" }
       menu.choices(:ruby) { lang = "ruby" }
       menu.choice(:javascript) { lang = "javascript" }
@@ -82,7 +109,7 @@ class CLI < Thor
     Migrator.new(@config).init
   rescue Exception => e
     Log.error("Error while initialization.", e)
-    @config.remove
+    @config.delete
     exit
   end
 

data/db-migrate.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'db-migrate'
-  s.version     = '0.0.3'
+  s.version     = '0.0.4'
   s.licenses    = ['MIT']
   s.summary     = "Tool for managing and executing your database migrations."
   s.description = "#{s.summary} It supports multiple databases and multiple languages for writing migration scripts."
@@ -14,12 +14,13 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'thor', ['0.19.1']
   s.add_runtime_dependency 'highline', ['1.7.8']
   s.add_runtime_dependency 'json', ['1.8.3']
-  s.add_runtime_dependency 'mysql2', ['0.4.2']
-  s.add_runtime_dependency 'pg', ['0.18.4']
   s.add_runtime_dependency 'parseconfig', ['1.0.6']
   s.add_runtime_dependency 'colorize', ['0.7.7']
   s.add_runtime_dependency 'terminal-table', ['1.5.2']
+  s.add_runtime_dependency 'wannabe_bool', ['0.5.0']
 
   # dev deps
   s.add_development_dependency 'rspec', ['3.4.0']
+  s.add_development_dependency 'pg', ['0.18.4']
+  s.add_development_dependency 'mysql2', ['0.4.2']
 end

data/lib/migrate/conf.rb

@@ -32,10 +32,19 @@ module Migrate
     def load!
       Log.info("Loading configuration...")
       config = ParseConfig.new(@file_path)
-  
+
       config.get_params.map do |param|
+        value = nil
+        env_var = config[param].match(/\$\{(.*)\}/)
+
+        if env_var != nil
+          value = ENV[env_var[1]]
+        else
+          value = config[param]
+        end
+
         self.class.send(:attr_reader, param)
-        instance_variable_set("@#{param}", config[param])
+        instance_variable_set("@#{param}", value)
       end
 
       @loaded = true
@@ -43,7 +52,9 @@ module Migrate
     end
 
     def delete
-      File.delete @file_path
+      if File.exists? @file_path
+        File.delete @file_path
+      end
     rescue Exception => e
       Log.error("Error while removing configuration file.", e)
       exit
@@ -53,12 +64,14 @@ module Migrate
       case @storage
       when "pg"
         if @pg == nil
+          require_relative "./storage/postgres"
           @pg = Storage::Postgres.new(self)
         end
 
         @pg
       when "mysql"
         if @mysql == nil
+          require_relative "./storage/mysql"
           @mysql = Storage::Mysql.new(self)
         end
 

data/lib/migrate/storage.rb

@@ -1,7 +1,5 @@
 module Migrate
   module Storage
     require_relative "./storage/db"
-    require_relative "./storage/postgres"
-    require_relative "./storage/mysql"
   end
 end

data/lib/migrate/storage/mysql.rb

@@ -7,7 +7,7 @@ module Migrate
         super
         @conn = Mysql2::Client.new(
           :database => @config.database,
-          :host => @config.host, 
+          :host => @config.host,
           :port => @config.port,
           :username => @config.user,
           :password => @config.password,
@@ -22,8 +22,8 @@ module Migrate
           version INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
           description TEXT,
           created_date TIMESTAMP NOT NULL,
-          last_up TIMESTAMP,
-          last_down TIMESTAMP
+          last_up TIMESTAMP NULL,
+          last_down TIMESTAMP NULL
         );
         eos
 

data/spec/lib/config_spec.rb

@@ -9,7 +9,7 @@ describe "Conf" do
       user: "postgres",
       password: "password",
       version_info: "version_info",
-      version_number: "version_number"
+      version_number: "${MIGRATE_TEST_VERSION_NUMBER}"
     }
   }
 
@@ -33,7 +33,7 @@ describe "Conf" do
 
       config = Conf.new(fixtures, "test.config")
       config.init(config_hash)
-      expect(config.exists?).to eq(true)     
+      expect(config.exists?).to eq(true)
       expect(File.exist? config_path). to be true
     ensure
       if File.exist? config_path
@@ -41,8 +41,9 @@ describe "Conf" do
       end
     end
   end
-  
+
   it "should load configuration" do
+    ENV["MIGRATE_TEST_VERSION_NUMBER"] = "version_number"
     config.init(config_hash)
     config.load!
     expect(config.host).to eq("localhost")
@@ -71,7 +72,7 @@ describe "Conf" do
     end
   end
 
-  [{type: "pg", cls: Storage::Postgres, conf: $pg_config_hash}, 
+  [{type: "pg", cls: Storage::Postgres, conf: $pg_config_hash},
    {type: "mysql", cls: Storage::Mysql, conf: $mysql_config_hash}].each do |storage|
     context storage[:type] do
       it "should be able to get database instance" do
@@ -83,7 +84,7 @@ describe "Conf" do
   end
 
   [{type: "go", cls: Lang::Go}, {type: "sql", cls: Lang::Sql},
-   {type: "ruby", cls: Lang::Ruby}, {type: "javascript", cls: Lang::Javascript}, 
+   {type: "ruby", cls: Lang::Ruby}, {type: "javascript", cls: Lang::Javascript},
    {type: "python", cls: Lang::Python}].each do |lang|
     context lang[:type] do
       it "should be able to get language instance" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db-migrate
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ivan Pusic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-06 00:00:00.000000000 Z
+date: 2016-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -53,89 +53,103 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.8.3
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: parseconfig
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 1.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.4
+        version: 0.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.4
+        version: 0.7.7
 - !ruby/object:Gem::Dependency
-  name: parseconfig
+  name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: wannabe_bool
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: terminal-table
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.2
-  type: :runtime
+        version: 3.4.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 0.18.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 0.18.4
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.2
 description: Tool for managing and executing your database migrations. It supports
   multiple databases and multiple languages for writing migration scripts.
 email: pusic007@gmail.com
@@ -144,10 +158,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - bin/migrate
@@ -193,17 +208,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.4.8
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Tool for managing and executing your database migrations.