flextures 1.9.10 → 1.9.11

data/VERSION

@@ -1 +1 @@
-1.9.10
+1.9.11

data/flextures.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "flextures"
-  s.version = "1.9.10"
+  s.version = "1.9.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["baban"]
-  s.date = "2012-04-27"
+  s.date = "2012-05-12"
   s.description = "load and dump fixtures"
   s.email = "babanba.n@gmail.com"
   s.extra_rdoc_files = [

data/lib/flextures/flextures.rb

@@ -43,10 +43,11 @@ module Flextures
     end
   end
 
-  # 前テーブル削除のときにほんとうに消去して良いテーブル一覧を返す
+  # 全テーブル削除のときにほんとうに消去して良いテーブル一覧を返す
   def self.deletable_tables
     tables = ActiveRecord::Base.connection.tables
     tables.delete "schema_migrations"
+    tables.delete "admin_tables"
     tables
   end
 

data/lib/flextures/flextures_command.rb

@@ -39,7 +39,7 @@ module Flextures
       def self.load
         table_names = Flextures::ARGS.parse
         Flextures::init_load
-        Flextures::init_tables
+        Flextures::init_tables unless ENV["T"] or ENV["TABLE"] or ENV["M"] or ENV["MODEL"] or ENV["F"] or ENV["FIXTUES"]
         puts "loading..."
         table_names.map { |fmt| Flextures::Loader::load(fmt) }
       end
@@ -47,7 +47,7 @@ module Flextures
       def self.csvload
         table_names = Flextures::ARGS.parse
         Flextures::init_load
-        Flextures::init_tables
+        Flextures::init_tables unless ENV["T"] or ENV["TABLE"] or ENV["M"] or ENV["MODEL"] or ENV["F"] or ENV["FIXTUES"]
         puts "loading..."
         table_names.map { |fmt| Flextures::Loader::csv(fmt) }
       end
@@ -55,7 +55,7 @@ module Flextures
       def self.ymlload
         table_names = Flextures::ARGS::parse
         Flextures::init_load
-        Flextures::init_tables
+        Flextures::init_tables unless ENV["T"] or ENV["TABLE"] or ENV["M"] or ENV["MODEL"] or ENV["F"] or ENV["FIXTUES"]
         puts "loading..."
         table_names.map { |fmt| Flextures::Loader::yml(fmt) }
       end

data/lib/flextures/flextures_loader.rb

@@ -133,7 +133,7 @@ module Flextures
     def self.csv format
       table_name, file_name, ext = file_exist format, [:csv]
 
-      print "try loading #{file_name}.yml\n" unless [:fun].include? format[:loader]
+      print "try loading #{file_name}.csv\n" unless [:fun].include? format[:loader]
       return nil unless File.exist? "#{file_name}.csv"
 
       klass = PARENT::create_model table_name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flextures
 version: !ruby/object:Gem::Version
-  version: 1.9.10
+  version: 1.9.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-27 00:00:00.000000000 Z
+date: 2012-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -722953521
+      hash: 621201837
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: