dtf 0.3.3 → 0.3.5

data/Rakefile

@@ -26,3 +26,14 @@ end
 task :spec do
   Rake::Task['cover_me:report'].invoke
 end
+
+namespace :dtf do
+
+  desc "Install DTF thor tasks"
+  task :install do
+    require 'dtf'
+    puts "Installing DTF tasks"
+    FileUtils.cp(Dir.glob("#{File.join("#{Gem.loaded_specs['dtf'].gem_dir}", 'lib/tasks/*')}"), 'lib/tasks/')
+  end
+end
+

data/lib/dtf.rb

@@ -14,6 +14,28 @@ module Dtf
       puts "Please see 'dtf -h' for the list of recognized commands."
     end
 
+    # Copies thor tasks into any project which require's dtf
+    # e.g bundle exec dtf setup
+    class SetupDtf
+      def initialize(cmd_name, options)
+        @cmd_name = cmd_name
+        @cmd_opts = options
+      end
+      
+      def execute
+        if "#{Gem.loaded_specs['dtf'].gem_dir}" == "#{Dir.pwd}"
+          $stderr.puts "Copying files over themselves is not usually good. Aborting!"
+          abort()
+        elsif ! File.exists?("#{Dir.pwd}/lib/tasks/setup.thor")
+          puts "Installing DTF tasks"
+          FileUtils.cp(Dir.glob("#{File.join("#{Gem.loaded_specs['dtf'].gem_dir}", 'lib/tasks/*')}"), "#{Dir.pwd}/lib/tasks/")
+        else
+          $stderr.puts "Copying files over themselves is not usually good. Aborting!"
+          abort()
+        end
+      end    
+    end
+    
     # This sub-command is used to add a User to the Test Framework system
     #
     # Required Parameters are:
@@ -201,7 +223,7 @@ module Dtf
   # It also doubles as DTF's help system.
   class OptionsParser
     # List of all sub-commands known within the Help System
-    SUB_COMMANDS = %w(create_user delete_user create_vs delete_vs)
+    SUB_COMMANDS = %w(create_user delete_user create_vs delete_vs setup)
     
     # ARGV parsing method and options builder. Method depends on Trollop gem.
     #
@@ -253,6 +275,10 @@ module Dtf
           opt(:user_name, desc="Username of VS owner - REQUIRED", opts={:type => :string, :short => '-u'})
           opt(:id, desc="ID of VS to be deleted - REQUIRED", opts={:type => :int, :short => '-i'})
         end
+      when "setup_dtf"
+        Trollop::options do
+          opt(:install, desc="Defines if should install or not", opts={:type => :flag, :default => true})
+        end
       when nil
         Trollop::die "No command specified! Please specify an applicable command"
       else

data/lib/dtf/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Dtf
-  VERSION = "0.3.3"
+  VERSION = "0.3.5"
 end

data/lib/tasks/setup.thor

@@ -1,54 +1,68 @@
 # encoding: UTF-8
 
 class DtfSetup < Thor
-
-  desc "install", "Installs database migrations, the main schema, and configuration files"
+  
+  desc "install", "Installs DTF core database migrations"
   method_options :force => :boolean
   def install(name= "*")
     puts "Installing db migrations, main schema, and config files"
-
+    
     # The gem is installed elsewhere so the copy path needs to be
-    # relative to the gem, not the user.
-    curr_dir = File.dirname(__FILE__)
+    # relative to the gem, not the user. Gem.loaded_specs['dtf'].gemdir
+    # tells us where the DTF master gem lives and we need to build up the from location
+    # based off that, then copy locally relative to the user.
+    # 
+    # Migrations
+    from_dir = "#{File.join("#{Gem.loaded_specs['dtf'].gem_dir}", 'db/migrate')}"
+    # Add schema.rb and seeds to list of additional files to be pushed
+    other_files = ["#{from_dir}/../schema.rb", "#{from_dir}/../seeds.rb"]
+    
+    other_files.each do |source|
+      puts "Generating db/#{File.basename(source)}"
+      FileUtils.cp(source, "#{Dir.pwd}/db/#{File.basename(source)}" )
+    end
 
-    Dir["#{curr_dir}/../../db/migrate/#{name}"].each do |source|
+    Dir["#{from_dir}/#{name}"].each do |source|
 
       # Use File.basename to remove the gem's path info so we can
       # use just the filename to copy relative to the user.
-      destination = "db/migrate/#{File.basename(source)}"
+      destination = "#{Dir.pwd}/db/migrate/#{File.basename(source)}"
 
-      FileUtils.rm(destination) if options[:force] && File.exist?(destination)
-      if File.exist?(destination)
-        puts "Skipping #{destination} because it already exists"
+      FileUtils.rm(destination) if options[:force] && File.exist?(destination) && File.file?(destination)
+      if File.directory?(destination)
+        puts "Oops, db/migrate/#{File.basename(destination)} is a directory. Skipping!"
+      elsif File.exist?(destination)
+        puts "Skipping db/migrate/#{File.basename(destination)} because it already exists"
       else
-        puts "Generating #{destination}"
+        puts "Generating db/migrate/#{File.basename(destination)}"
         FileUtils.cp(source, destination)
       end
     end
+    puts "Don't forget to run 'rake db:setup' next! Run 'rake db:drop:all' first, if your databases already exist."
   end
 
-  desc "config [NAME]", "Copy db configuration file(s)"
+  # dtf_setup:config is added to make sure you can copy the *config* without having to recopy
+  # the migrations and schema as well.
+  desc "config [NAME]", "Copy db configuration"
   method_options :force => :boolean
-  def config(name = "*")
-
-    # The gem is installed elsewhere so the copy path needs to be
-    # relative to the gem, not the user.
-    curr_dir = File.dirname(__FILE__)
-
-    Dir["#{curr_dir}/../../examples/db/#{name}"].each do |source|
+  def config(name = "config.yml")
+    
+    from_dir = "#{Gem.loaded_specs['dtf'].gem_dir}"
+    
+    # Use File.basename to remove the gem's path info so we can
+    # use just the filename to copy relative to the user.
+    destination = "#{Dir.pwd}/db/#{name}"
 
-      # Use File.basename to remove the gem's path info so we can
-      # use just the filename to copy relative to the user.
-      destination = "db/#{File.basename(source)}"
-
-      FileUtils.rm(destination) if options[:force] && File.exist?(destination)
-      if File.exist?(destination)
-        puts "Skipping #{destination} because it already exists"
-      else
-        puts "Generating #{destination}"
-        FileUtils.cp(source, destination)
-      end
+    FileUtils.rm(destination) if options[:force] && File.exist?(destination) && File.file?(destination)
+    if File.directory?(destination)
+      puts "Oops, db/#{File.basename(destination)} is a directory. Ignoring!"
+    elsif File.exist?(destination)
+      puts "Skipping db/#{File.basename(destination)} because it already exists"
+    else
+      puts "Generating db/#{File.basename(destination)}"
+      FileUtils.cp("#{from_dir}/db/#{name}", destination)
     end
+    puts "Don't forget to run 'rake db:setup' next! Run 'rake db:drop:all' first, if your databases already exist."
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dtf
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor