Merge pull request #16 from netbe/feature/restructure

Restructure project

.gitignore

@@ -1,12 +1,16 @@
+# Generated files
 *.csv
 *.strings
 *.lproj
+*.gem
 *~
 *#
-*.gem
-*.sublime-project
 #*#
+
+# Config file
 .csvconverter
+
+# SimpleCov
 coverage
 
 # ignore Gemfile.lock as http://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/
@@ -17,3 +21,7 @@ Gemfile.lock
 .ruby-version
 .rbenv-version
 .rvmrc
+
+# Sublime Text
+*.sublime-workspace
+*.sublime-project

.travis.yml

@@ -1,6 +1,14 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 1.9.2
-  - 1.8.7
-  - 2.0.0
+- 1.9.3
+- 1.9.2
+- 1.8.7
+- 2.0.0
+deploy:
+  provider: rubygems
+  api_key:
+    secure: Xjq+v+jEU6wK4BtyfnV1elegNcxK6Ah/O99Sn9c2IlkCmJ1wxLBouqzEiSorSJ4IOMa5H2y3gwo5GXOr6Y7d8huyGrPuBeCSGqAmH77wNCIv7G+jnLiYb1sRZbtKcPW2QaN6JF81qDIelwyspMfo6/ug1qN1x323UaxZl7f7nUE=
+  gem: csv2strings
+  on:
+    tags: true
+    repo: netbe/CSV-to-iOS-Localizable.strings-converter

Gemfile

@@ -4,5 +4,5 @@ source "http://rubygems.org"
 gemspec
 
 group :test do
-  gem 'coveralls', :require => false
+  gem 'coveralls', :require => false, :platforms => [:ruby_19, :ruby_20]
 end

Rakefile

@@ -2,8 +2,10 @@ require 'rake/testtask'
 
 Rake::TestTask.new do |t|
   t.libs << "test"
-  t.test_files = FileList['test/**/*_test.rb']
+  t.test_files = FileList['test/csvconverter/**/test_*.rb']
+  # t.warning = true
+  t.verbose = true
 end
 
 desc "Run tests"
-task :default => :test
+task :default => :test

bin/csv2strings

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.expand_path('../../lib/csv2strings_command', __FILE__)
-
+$: << File.expand_path("../lib/", __FILE__)
+require 'csvconverter/commands/csv2strings_command'
 
 CSV2StringsCommand.start

bin/strings2csv

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.expand_path('../../lib/strings2csv_command', __FILE__)
-
+$: << File.expand_path("../lib/", __FILE__)
+require 'csvconverter/commands/strings2csv_command'
 
 Strings2CSVCommand.start

csv2strings.gemspec

@@ -15,12 +15,14 @@ Gem::Specification.new do |s|
   if RUBY_VERSION < '1.9'
     s.add_dependency "fastercsv"
     s.add_dependency "nokogiri", "= 1.5.10"
+    s.add_dependency "orderedhash"
   end
-  s.add_dependency "orderedhash", "~> 0.0.6"
-  s.add_dependency "google_drive", '0.3.6'
 
+  s.add_dependency "google_drive", '0.3.6'
   s.add_development_dependency "rake"
+
   s.add_development_dependency "test-unit"
+  s.add_development_dependency "simplecov"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

lib/csvconverter.rb

@@ -1,8 +1,12 @@
-$: << File.expand_path(File.join(File.dirname(__FILE__)))
-require 'rubygems'
-
 CSVGEM = RUBY_VERSION.match(/^[0-1]\.[0-8]\./) ? 'faster_csv' : 'csv'
 
+if RUBY_VERSION.match(/^[0-1]\.[0-8]\./)
+  require "orderedhash"
+  ORDERED_HASH_CLASS = OrderedHash
+else
+  ORDERED_HASH_CLASS = Hash
+end
+
 begin
 	require CSVGEM
 rescue LoadError
@@ -12,5 +16,6 @@
 end
 
 CSVParserClass = CSVGEM == 'csv' ? CSV : FasterCSV
-require "csv2strings/converter"
-require "strings2csv/converter"
+require "csvconverter/csv2strings"
+require "csvconverter/strings2csv"
+require "csvconverter/google_doc"

lib/command.rb → lib/csvconverter/command.rb

@@ -1,8 +1,5 @@
-$: << File.expand_path(File.join(File.dirname(__FILE__)))
 require 'yaml'
 require 'thor'
-require 'csvconverter'
-require 'google_doc'
 
 class Command < Thor
   include Thor::Actions

lib/csv2strings_command.rb → lib/csvconverter/commands/csv2strings_command.rb

@@ -1,5 +1,4 @@
-$: << File.expand_path(File.join(File.dirname(__FILE__)))
-require "command"
+require "csvconverter/command"
 class CSV2StringsCommand < Command
   default_task :csv2strings
 
@@ -20,7 +19,7 @@ def csv2strings(filename = nil)
       help("csv2strings")
       exit
     end
-    
+
     filename ||= options['filename']
     if options['fetch']
       say "Downloading file from Google Drive"
@@ -33,12 +32,12 @@ def csv2strings(filename = nil)
       help("csv2strings")
       exit
     end
- 
+
     args = options.dup
     args.delete(:langs)
     args.delete(:filename)
-    converter = CSV2Strings::Converter.new(filename, options[:langs], args)
-    say converter.csv_to_dotstrings    
+    converter = CSV2Strings.new(filename, options[:langs], args)
+    say converter.csv_to_dotstrings
   end
 
 end

lib/strings2csv_command.rb → lib/csvconverter/commands/strings2csv_command.rb

@@ -1,6 +1,4 @@
-$: << File.expand_path(File.join(File.dirname(__FILE__)))
-require "command"
-
+require "csvconverter/command"
 class Strings2CSVCommand < Command
   default_task :strings2csv
 
@@ -15,10 +13,10 @@ def strings2csv
     unless options.has_key?('filenames')
       say "No value provided for required options '--filenames'"
       help("strings2csv")
-      exit
+      return
     end
-    converter = Strings2CSV::Converter.new(options)
+    converter = Strings2CSV.new(options)
   	debug_values = converter.dotstrings_to_csv(!options[:dryrun])
-    say debug_values.inspect if options[:dryrun]   
+    say debug_values.inspect if options[:dryrun]
   end
-end
+end