mongify 0.3.1 → 0.9

data/lib/mongify/cli/options.rb

@@ -11,82 +11,75 @@ module Mongify
         @parser = OptionParser.new
         #@command_class = ReekCommand
         set_options
-        
+        parse_options
       end
-      
+
       # Banner for help output
       def banner
         progname = @parser.program_name
         return <<EOB
-Usage: #{progname} command [database_translation.rb] [-c database.config]
+Usage: #{progname} command database.config [database_translation.rb]
 
 Commands:
-#{Mongify::CLI::WorkerCommand.list_commands.join("\n")}
+#{Mongify::CLI::Command::Worker.list_commands.join("\n")}
 
 Examples:
 
-#{progname} check -c database.config
-#{progname} translation -c datbase.config > database_translation.rb
-#{progname} process database_translation.rb -c database.config
+#{progname} check database.config
+#{progname} translation datbase.config > database_translation.rb
+#{progname} process database.config database_translation.rb
 
 See http://github.com/anlek/mongify for more details
 
 EOB
       end
-      
+
       # Sets the options for CLI
       # Also used for help output
       def set_options
         @parser.banner = banner
         @parser.separator "Common options:"
         @parser.on("-h", "--help", "Show this message") do
-          @command_class = HelpCommand
+          @command_class = Command::Help
         end
         @parser.on("-v", "--version", "Show version") do
-          @command_class = VersionCommand
-        end
-        @parser.on('-c', '--config FILE', "Configuration File to use") do |file|
-          @config_file = file
+          @command_class = Command::Version
         end
       end
-      
+
       # Parses CLI passed attributes and figures out what command user is trying to run
       def parse
-        parse_options
-        
-        if @command_class == HelpCommand
-          HelpCommand.new(@parser)
-        elsif @command_class == VersionCommand
-          VersionCommand.new(@parser.program_name)
+        if @command_class == Command::Help
+          Command::Help.new(@parser)
+        elsif @command_class == Command::Version
+          Command::Version.new(@parser.program_name)
         else
-          raise ConfigurationFileNotFound, "You need to provide a configuration file location #{@config_file}" unless @config_file
-          #TODO: In the future, request sql_connection and nosql_connection from user input
-          config = Configuration.parse(@config_file)
-          
-          WorkerCommand.new(action, config, translation_file, @parser)
+          Command::Worker.new(action, config_file, translation_file, @parser)
         end
       end
-      
+
       #######
       private
       #######
-      
+
       # Returns the translation_file or nil
       def translation_file(argv=@argv)
-        parse_options
-        return nil if argv.length < 2
-        argv[1]
+        argv[2] if argv.length >= 3 and File.exist?(argv[2]) and !File.directory?(argv[2])
       end
-      
+
       # Returns action (command) user is calling or ''
       def action(argv=@argv)
-        parse_options
         @argv.try(:[],0) || ''
       end
-       
-      # option parser, ensuring parse_options is only called once     
+
+      # Returns the config file
+      def config_file(argv=@argv)
+        @config_file ||= Configuration.parse(argv[1]) if argv.length >= 2 and File.exist?(argv[1]) and !File.directory?(argv[1])
+      end
+
+      # option parser, ensuring parse_options is only called once
       def parse_options
-        @parsed = true && @parser.parse!(@argv) unless @parsed
+        @parser.parse!(@argv)
       rescue OptionParser::InvalidOption => er
         raise Mongify::InvalidOption, er.message, er.backtrace
       end

data/lib/mongify/database/no_sql_connection.rb

@@ -95,7 +95,7 @@ module Mongify
       
       # Inserts into the collection a given row
       def insert_into(colleciton_name, row)
-        db[colleciton_name].insert(row, :safe => true)
+        db[colleciton_name].insert(row)
       end
       
       # Updates a collection item with a given ID with the given attributes

data/lib/mongify/database/sql_connection.rb

@@ -30,7 +30,6 @@ module Mongify
       REQUIRED_FIELDS = %w{host adapter database}
       
       def initialize(options=nil)
-        @prefixed_db = false
         super(options)
       end
 

data/lib/mongify/progressbar.rb

@@ -19,10 +19,10 @@ module Mongify
     #Progress bar version
     VERSION = "0.9.1"
 
-    def initialize (title, total, out = STDERR)
+    def initialize (title, total)
       @title = title
       @total = total
-      @out = out
+      @out = Mongify::Configuration.out_stream
       @terminal_width = 80
       @bar_mark = "o"
       @current = 0
@@ -156,6 +156,7 @@ module Mongify
 
     # Draws the bar
     def show
+      return unless @out
       arguments = @format_arguments.map {|method| 
         method = sprintf("fmt_%s", method)
         send(method)
@@ -196,6 +197,7 @@ module Mongify
     public
     # Clear's line
     def clear
+      return unless @out
       @out.print "\r"
       @out.print(" " * (get_width - 1))
       @out.print "\r"

data/lib/mongify/version.rb

@@ -1,4 +1,4 @@
 module Mongify
   # Mongify's Current Version Number
-  VERSION = "0.3.1"
+  VERSION = "0.9"
 end

data/mongify.gemspec

@@ -14,19 +14,19 @@ Gem::Specification.new do |s|
 
   s.add_dependency('activerecord', ">=3.0.3")
   s.add_dependency('activesupport', ">=3.0.3")
-  s.add_dependency('mysql2')
-  s.add_dependency('mongo', ">= 1.1.5")
-  s.add_dependency('bson_ext', ">= 1.1.5")
+  s.add_dependency('mongo', "~> 1.8.2")
+  s.add_dependency('bson_ext', "~> 1.8.2") unless RUBY_PLATFORM == 'java'
   s.add_dependency('highline', '>= 1.6.1')
 
+
   s.add_development_dependency('rspec', '>= 2.0')
   s.add_development_dependency('rcov', '>= 0.9.9')
   s.add_development_dependency('cucumber', '>= 0.10')
   s.add_development_dependency('mocha', '>= 0.9.8')
   s.add_development_dependency('yard', '>= 0.5.3')
-  s.add_development_dependency('watchr', '>= 0.6')
   s.add_development_dependency('sqlite3-ruby', '>= 1.3')
-  s.add_development_dependency('mysql', '>= 2.8.1')
+  s.add_development_dependency('mysql2', '~> 0.2.7')  
+  s.add_development_dependency('watchr', '>= 0.6')
   s.add_development_dependency('rake')
 
   s.files         = `git ls-files`.split("\n")

data/spec/mongify/cli/application_spec.rb

@@ -1,17 +1,16 @@
 require 'spec_helper'
 
 describe Mongify::CLI::Application do
-  before(:each) do
-    @application = Mongify::CLI::Application.new()
-  end
-
   context "execute!" do
     it "should return a 0" do
+      @application = Mongify::CLI::Application.new()
+      Mongify::Configuration.out_stream = nil
       @application.execute!.should == 0
     end
     
     it "should return a 1 on error" do
       @application = Mongify::CLI::Application.new(["door"])
+      Mongify::Configuration.out_stream = nil
       @application.execute!.should == 1
     end
   end

data/spec/mongify/cli/{help_command_spec.rb → command/help_spec.rb}

@@ -1,8 +1,8 @@
 require 'spec_helper'
-describe Mongify::CLI::HelpCommand do
+describe Mongify::CLI::Command::Help do
   before :each do
     @text = 'Piece of interesting text'
-    @cmd = Mongify::CLI::HelpCommand.new(@text)
+    @cmd = Mongify::CLI::Command::Help.new(@text)
     @view = mock('view').as_null_object
   end
 

data/spec/mongify/cli/{version_command_spec.rb → command/version_spec.rb}

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe Mongify::CLI::VersionCommand do
+describe Mongify::CLI::Command::Version do
   before :each do
     @text = 'Piece of interesting text'
-    @cmd = Mongify::CLI::VersionCommand.new(@text)
+    @cmd = Mongify::CLI::Command::Version.new(@text)
     @view = mock('view').as_null_object
   end
 
@@ -12,7 +12,7 @@ describe Mongify::CLI::VersionCommand do
     @cmd.execute(@view)
   end
 
-  it 'displays the Reek version on the view' do
+  it 'displays Mongify version on the view' do
     @view.should_receive(:output).with(/#{Mongify::VERSION}/)
     @cmd.execute(@view)
   end

data/spec/mongify/cli/options_spec.rb

@@ -1,62 +1,58 @@
 require 'spec_helper'
 
 describe Mongify::CLI::Options do
-  before(:each) do
-    @config_file = File.join(File.dirname(File.dirname(File.dirname(File.expand_path(__FILE__)))), 'files', 'base_configuration.rb')
-  end
+  let(:config_file){File.join(Mongify.root, 'spec', 'files', 'base_configuration.rb')}
+  let(:translation_file){File.join(Mongify.root, 'spec', 'files', 'translation.rb')}
+
   it "should run help command when passed an -h" do
     @options = Mongify::CLI::Options.new(['-h'])
     @options.parse
-    @options.instance_variable_get(:@command_class).should == Mongify::CLI::HelpCommand
+    @options.instance_variable_get(:@command_class).should == Mongify::CLI::Command::Help
   end
-  
+
   it "should run version command when passed an -h" do
     @options = Mongify::CLI::Options.new(['-v'])
     @options.parse
-    @options.instance_variable_get(:@command_class).should == Mongify::CLI::VersionCommand  
+    @options.instance_variable_get(:@command_class).should == Mongify::CLI::Command::Version
   end
-  
+
   context "action" do
     it "should get action command" do
       @options = Mongify::CLI::Options.new(['check'])
       @options.send(:action).should == 'check'
     end
-    
+
     it "should return blank if no action is sent" do
       @options = Mongify::CLI::Options.new(['-v'])
       @options.send(:action).should == ''
     end
   end
-  
+
+  # using check here just so that it doesn't have translate but still tests the args properly
   context "translation" do
     it "should return path" do
-      @options = Mongify::CLI::Options.new(['check', '-c', 'some/config', 'some/folder/translation'])
-      @options.send(:translation_file).should == 'some/folder/translation'
+      @options = Mongify::CLI::Options.new(['check', config_file, translation_file])
+      @options.send(:translation_file).should == translation_file
     end
-    
+
     it "should return nil if no path specified" do
-      @options = Mongify::CLI::Options.new(['check', '-c', 'some/config'])
+      @options = Mongify::CLI::Options.new(['check', config_file])
       @options.send(:translation_file).should be_nil
     end
   end
-  
-  
-  context "Configuration file" do
-    it "should take option (-c) with a file" do
-      @options = Mongify::CLI::Options.new(['-c', @config_file])
+
+
+  context "config_file" do
+    it "should get config after action" do
+      @options = Mongify::CLI::Options.new(['check', config_file])
       @options.parse
-      @options.instance_variable_get(:@config_file).should == @config_file
+      @options.instance_variable_get(:@config_file).should_not be_nil
     end
-  
-    it "should be require" do
-      @options = Mongify::CLI::Options.new(["database_translation.rb"])
-      lambda {@options.parse}.should raise_error(Mongify::ConfigurationFileNotFound)
-    end
-    
+
     it "should call Configuration.parse" do
-      Mongify::Configuration.should_receive(:parse)
-      @options = Mongify::CLI::Options.new(['-c', @config_file])
-      @options.parse
+      Mongify::Configuration.should_receive(:parse).and_return(Mongify::Configuration.new)
+      @options = Mongify::CLI::Options.new(['check', config_file])
+      @options.parse 
     end
   end
 end

data/spec/mongify/cli/worker_command_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongify::CLI::WorkerCommand do
+describe Mongify::CLI::Command::Worker do
   before(:each) do
     @config = Mongify::Configuration.new()
     @sql_connection = Mongify::Database::SqlConnection.new()
@@ -20,13 +20,13 @@ describe Mongify::CLI::WorkerCommand do
   
   context "list_commands" do
     it "should return same number as available" do
-      Mongify::CLI::WorkerCommand.list_commands.size.should == Mongify::CLI::WorkerCommand::AVAILABLE_COMMANDS.size
+      Mongify::CLI::Command::Worker.list_commands.size.should == Mongify::CLI::Command::Worker::AVAILABLE_COMMANDS.size
     end
   end
   
   context "check command" do
     before(:each) do
-      @command = Mongify::CLI::WorkerCommand.new('check', @config)
+      @command = Mongify::CLI::Command::Worker.new('check', @config)
       @command.stub(:check_sql_connection).and_return(true)
       @command.stub(:check_nosql_connection).and_return(true)
     end
@@ -39,13 +39,13 @@ describe Mongify::CLI::WorkerCommand do
       @command.execute(@view)
     end
     it "should require config file" do
-      lambda { @command = Mongify::CLI::WorkerCommand.new('check').execute(@view) }.should raise_error(Mongify::ConfigurationFileNotFound)
+      lambda { @command = Mongify::CLI::Command::Worker.new('check').execute(@view) }.should raise_error(Mongify::ConfigurationFileNotFound)
     end
   end
   
   context "non-existing command" do
      before(:each) do
-      @command = Mongify::CLI::WorkerCommand.new('unknown')
+      @command = Mongify::CLI::Command::Worker.new('unknown')
     end
     
     it "should report error" do
@@ -61,12 +61,12 @@ describe Mongify::CLI::WorkerCommand do
 
   context "translation command" do
     before(:each) do
-      @command = Mongify::CLI::WorkerCommand.new('translation', @config)
+      @command = Mongify::CLI::Command::Worker.new('translation', @config)
       Mongify::Translation.stub(:load).with(@sql_connection).and_return(stub(:print => 'worked'))
     end
     
     it "should require configuration file" do
-      lambda { Mongify::CLI::WorkerCommand.new('translation').execute(@view) }.should raise_error(Mongify::ConfigurationFileNotFound)
+      lambda { Mongify::CLI::Command::Worker.new('translation').execute(@view) }.should raise_error(Mongify::ConfigurationFileNotFound)
     end
     
     it "should check sql connection" do
@@ -82,7 +82,7 @@ describe Mongify::CLI::WorkerCommand do
   
   context "process command" do
     before(:each) do
-      @command = Mongify::CLI::WorkerCommand.new('process', @config, 'spec/files/translation.rb')
+      @command = Mongify::CLI::Command::Worker.new('process', @config, 'spec/files/translation.rb')
       Mongify::Translation.stub(:parse).and_return(mock(:process => true))
     end
     it "should report success" do
@@ -92,11 +92,11 @@ describe Mongify::CLI::WorkerCommand do
     end
     
     it "should require config file" do
-      lambda { @command = Mongify::CLI::WorkerCommand.new('process').execute(@view) }.should raise_error(Mongify::ConfigurationFileNotFound)
+      lambda { @command = Mongify::CLI::Command::Worker.new('process').execute(@view) }.should raise_error(Mongify::ConfigurationFileNotFound)
     end
     
     it "should require transaction file" do
-      lambda { @command = Mongify::CLI::WorkerCommand.new('process', @config).execute(@view) }.should raise_error(Mongify::TranslationFileNotFound)
+      lambda { @command = Mongify::CLI::Command::Worker.new('process', @config).execute(@view) }.should raise_error(Mongify::TranslationFileNotFound)
     end
     
     it "should check_connection" do

data/spec/mongify/database/no_sql_connection_spec.rb

@@ -77,7 +77,7 @@ describe Mongify::Database::NoSqlConnection do
     end
     context "insert_into" do
       it "should insert into a table using the mongo driver" do
-        @collection.should_receive(:insert).with({'first_name' => 'bob'}, anything)
+        @collection.should_receive(:insert).with({'first_name' => 'bob'})
         @mongodb_connection.insert_into('users', {'first_name' => 'bob'})
       end
     end

data/spec/mongify/database/sql_connection_spec.rb

@@ -1,38 +1,27 @@
 require 'spec_helper'
-
 describe Mongify::Database::SqlConnection do
   before(:all) do
     @db_path = DatabaseGenerator.sqlite
   end
 
-  before(:each) do
-    @sql_connection = Mongify::Database::SqlConnection.new(:adapter => 'sqlite3', :database => @db_path)
-  end
+  let(:sqlite_connection){Mongify::Database::SqlConnection.new(:adapter => 'sqlite3', :database => @db_path)}
+  let(:mysql_connection){@sql_connection = DatabaseGenerator.mysql_connection}
 
   context "Sqlite 3 config" do
-    before(:each) do
-      @adapter = 'sqlite3'
-      @sql_connection = Mongify::Database::SqlConnection.new(:adapter => @adapter, :database => @db_path)
-    end
-
     context "valid?" do
       it "should be true" do
-        @sql_connection.should be_valid
+        sqlite_connection.should be_valid
       end
     end
 
     context "testing connection" do
       it "should work" do
-        @sql_connection.should have_connection
+        sqlite_connection.should have_connection
       end
     end
   end
 
   context "MySql config" do
-    before(:each) do
-      @sql_connection = DatabaseGenerator.mysql_connection
-    end
-
     context "valid?" do
       it "should be true" do
         Mongify::Database::SqlConnection.new(:adapter => 'mysql', :host => 'localhost', :database => 'blue').should be_valid
@@ -43,13 +32,12 @@ describe Mongify::Database::SqlConnection do
     end
 
     context "testing connection" do
-      it "should call setup_connection_adapter before testing connection" do
-        @sql_connection.should_receive(:setup_connection_adapter)
-        @sql_connection.has_connection?
-      end
-
       it "should work" do
-        @sql_connection.should have_connection
+        mysql_connection.should have_connection
+      end
+      it "should call setup_connection_adapter before testing connection" do
+        mysql_connection.should_receive(:setup_connection_adapter)
+        mysql_connection.has_connection?
       end
     end
   end
@@ -57,24 +45,24 @@ describe Mongify::Database::SqlConnection do
   context "Sqlite connection" do
     context "testing connection" do
       it "should call setup_connection_adapter before testing connection" do
-        @sql_connection.should_receive(:setup_connection_adapter)
-        @sql_connection.has_connection?
+        sqlite_connection.should_receive(:setup_connection_adapter)
+        sqlite_connection.has_connection?
       end
 
       it "should work" do
-        @sql_connection.should have_connection
+        sqlite_connection.should have_connection
       end
     end
 
     context "tables" do
       it "should be able to get a list" do
-        @sql_connection.tables.should =~ ['comments', 'notes', 'posts', 'preferences', 'users']
+        sqlite_connection.tables.should =~ ['comments', 'notes', 'posts', 'preferences', 'users']
       end
     end
 
     context "columns" do
       it "should see columns for a table" do
-        @sql_connection.columns_for(:users).map{ |column| column.name }.should =~ ['id', 'first_name', 'last_name', 'created_at', 'updated_at']
+        sqlite_connection.columns_for(:users).map{ |column| column.name }.should =~ ['id', 'first_name', 'last_name', 'created_at', 'updated_at']
       end
     end
   end
@@ -83,8 +71,8 @@ describe Mongify::Database::SqlConnection do
     it "should generate correct select statement" do
       @mock_conn = mock
       @mock_conn.should_receive(:select_all).with('SELECT * FROM users')
-      @sql_connection.stub(:connection).and_return(@mock_conn)
-      @sql_connection.select_rows('users')
+      sqlite_connection.stub(:connection).and_return(@mock_conn)
+      sqlite_connection.select_rows('users')
     end
   end
 end