skiima 0.2.011 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTg0MDI4Y2E0ZDRjMzg2ODM3NDUwNmEwYmJhODhlMzk0ZGQxOWExZA==
+    YTA4YWVkN2QzYjFmYTkxNDYyODk1YTRiNDVmNDI5OTg1OGQxNWUwYw==
   data.tar.gz: !binary |-
-    NzUyNWY0MDcyODZhYmZiMmM5MzExYjhkODc3MTE1Zjg1NTk3ZTI2Yg==
+    ZmQ1YmFmNjE4Y2Q0ZWQzY2M1NDlmOGFmOWIxMzEzODM4NDFhMjNiNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTYyNGU3NzNjOWRmMGI2MTZmNjVkMzA3ODZlYTM4MDhlMGU5ZGJiNzJhODc1
-    ZDViZjJhOWZjMmNiZDViYjEwZGU5NTc1MGFiM2RhYThmN2MwZmMxNzg1NWRk
-    MTI4NmY2MjNmNjkxMGFmNmMzZTEwNWFhMWMxOGEwMzlmNDQ5NTU=
+    MzUyNzIxMTRlYzU0NGNhZjYyODhlYmFhNWI3N2M4YzY2NzMyZjQ0NTE0NDNi
+    N2E4ZmNiZTMwMTk5ZDYzOTk1ZjEzOTYyNWY3ZDcxYzg4YjcwODNkZWIzNmIz
+    MGNhMjNmZmUxNGY0NDE3OTYxZTFkOGY2OTUwNDkzODVmMzYxNWQ=
   data.tar.gz: !binary |-
-    YzQzYmQ2YzIxNWQ3YzBkZGQ4MzBkNWFiZWMzZGY3ODQzYTE1MDZlMGYzNjZl
-    OWEyNDE1MjcxOTliMzBiYTQyYzY5YWM3YTc4NmQ2YjMwMzU0MjY4M2QyMWE4
-    MjBjMTg2MTliNjM0OWUxOWU5Mjk0YWFhZjEwZjUwYWNiMjM0MTU=
+    NzQ3OTg0NTg5YmMxYzZlOTZiZjg2NjM5NzlhMjgwMjU1ZWJjOGMzNTdjYzA4
+    ZTIwMzI1N2U5MTU2MThjNWEyYWJiMTEwYzExZGIxMDcwNTE4YzU5YzQ2MGVm
+    ZjljN2IwNWQxNDM3ZmJiMzJmYWYwMGNkYjU0MmI3ZWYzOWFmZTM=

data/README.md

@@ -76,12 +76,29 @@ script_group_name:
   mysql:
     current:
       - view.script_name
-default:
-test:
-  - script_group_name
 dependency_group_name:
   - script_group_name
 
+# load/drop these script groups with:
+#   `rake skiima:up` & `rake skiima:down`
+# List migrations you have already squashed
+# - IE migrations that you removed to rely on schema.rb
+default:
+- script_group_a
+- script_group_b
+- script_group_c
+
+# load/drop these script groups with:
+#   `rake skiima:test:up` & `rake skiima:test:down`
+# For tests/CI!
+# List migrations that need to be run after a blank db is migrated
+# - IE migrations that you squashed, if you are migrating from scratch on CI
+# - If relying on db/schema.rb for CI, then list the groups you need for tests
+test:
+- script_group_a
+- script_group_b
+- script_group_c
+
 ```
 
 #### Running tests with your new Skiima Script Group

data/Rakefile

@@ -16,9 +16,10 @@ task :default => :test
 
 namespace :skiima do
 
+  desc "Run Skiima#setup as precursor to rake"
   task :setup do
     Skiima.setup do |config|
-      config.root_path = SPEC_ROOT
+      config.root_path = File.join(Skiima.root_path, 'spec')
       config.config_path = 'config'
       config.scripts_path = 'db/skiima'
       config.locale = :en
@@ -28,6 +29,7 @@ namespace :skiima do
   namespace :setup do
     namespace :db do
 
+      desc "Setup postgresql test databases to run specs"
       task :postgresql => :'skiima:setup' do
         env = :postgresql_root
         test_env = :postgresql_test
@@ -37,6 +39,7 @@ namespace :skiima do
         Skiima.up(env, :init_test_db, vars: vars)
       end
 
+      desc "Setup postgresql test databases to run specs"
       task :mysql => :'skiima:setup' do
         env = :mysql_root
         test_env = :mysql_test

data/lib/skiima.rb

@@ -32,20 +32,20 @@ module Skiima
   end
 
   def self.setup
-    yield config
+    yield config if config && block_given?
     set_translation_repository
   end
 
   require 'skiima/railtie' if defined?(Rails) && Rails::VERSION::MAJOR >= 3
 
   def self.defaults
-    { root_path: 'specify/in/config/block',
+    { root_path: File.expand_path('.'),
       config_path: 'config',
       database_yml: 'database.yml',
       scripts_path: 'db/skiima',
       dependencies_yml: 'dependencies.yml',
       interpolator: '&',
-      locale: 'en',
+      locale: :en,
       logging_out: 'STDOUT',
       logging_level: '3' }
   end
@@ -88,4 +88,4 @@ module Skiima
   class AdapterNotSpecified < BaseException; end
   class LoadError < BaseException; end
   class StatementInvalid < BaseException; end
-end
+end

data/lib/skiima/i18n.rb

@@ -1,8 +1,11 @@
 # encoding: utf-8
-
 module Skiima
   module I18n
 
+    def locale
+      @config[:locale] ||= :en
+    end
+
     def default_locale
       ::Skiima.locale
     end
@@ -21,4 +24,4 @@ module Skiima
     end
 
   end
-end
+end

data/lib/skiima/railties/skiima.rake

@@ -2,27 +2,36 @@ require "skiima"
 
 namespace :skiima do
 
-  desc "Runs Skiima.up for :default group in dependencies.yml"
-  task :up, [:skiima_env, :group] do
+  desc "Run Skiima#setup as precursor to rake"
+  task :setup do
+    Skiima.setup do |config|
+      config.config_path = 'config'
+      config.scripts_path = 'db/skiima'
+      config.locale = :en
+    end
+  end
+
+  desc "Runs Skiima.up for :default group in dependencies.yml (Run on Dev for squashed migrations)"
+  task :up, [:group, :skiima_env] => :setup do |t,args|
     args.with_defaults(:skiima_env => 'development', :group => 'default')
     Skiima.up(args.skiima_env.to_sym, args.group.to_sym)
   end
 
   desc "Runs Skiima.down for :default group in dependencies.yml"
-  task :down, [:skiima_env, :group] do
+  task :down, [:group, :skiima_env] => :setup do |t,args|
     args.with_defaults(:skiima_env => 'development', :group => 'default')
     Skiima.down(args.skiima_env.to_sym, args.group.to_sym)
   end
 
-  namespace :test, [:skiima_env, :group] do
-    desc "Runs Skiima.up for :test group in dependencies.yml"
-    task :up do
+  namespace :test do
+    desc "Runs Skiima.up for :test group in dependencies.yml (Run on CI for squashed migrations)"
+    task :up, [:group, :skiima_env] => :setup do |t,args|
       args.with_defaults(:skiima_env => 'test', :group => 'test')
       Skiima.up(args.skiima_env.to_sym, args.group.to_sym)
     end
 
     desc "Runs Skiima.down for :test group in dependencies.yml"
-    task :test, [:skiima_env, :group] do
+    task :test, [:group, :skiima_env] => :setup do |t,args|
       args.with_defaults(:skiima_env => 'test', :group => 'test')
       Skiima.down(args.skiima_env.to_sym, args.group.to_sym)
     end

data/lib/skiima/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Skiima
-  VERSION = "0.2.011"
+  VERSION = "0.3.0"
 end

data/spec/db/skiima/dependencies.yml

@@ -63,4 +63,26 @@ test_script_groups:
   - test_table
   - test_column_names
   - test_index
-  - test_schema
+  - test_schema
+
+
+# load/drop these script groups with:
+#   `rake skiima:test:up` & `rake skiima:test:down`
+# List migrations you have already squashed
+# - IE migrations that you removed to rely on schema.rb
+#default:
+#- script_group_a
+#- script_group_b
+#- script_group_c
+
+# load/drop these script groups with:
+#   `rake skiima:test:up` & `rake skiima:test:down`
+# For tests/CI!
+# List migrations that need to be run after a blank db is migrated
+# - IE migrations that you squashed, if you are migrating from scratch on CI
+# - If relying on CI for 
+#test:
+#- script_group_a
+#- script_group_b
+#- script_group_c
+

data/spec/spec_helper.rb

@@ -26,7 +26,7 @@ Bundler.require(:active_record)
 
 require "skiima"
 
-SKIIMA_ROOT = File.dirname(__FILE__)
+SKIIMA_ROOT = File.expand_path('./spec')
 
 Skiima.setup do |config|
   config.root_path = SKIIMA_ROOT

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skiima
 version: !ruby/object:Gem::Version
-  version: 0.2.011
+  version: 0.3.0
 platform: ruby
 authors:
 - David Conner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_gettext