flydata 0.1.13 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27e7790138861ddd0365bc10c4e54f2056422f38
-  data.tar.gz: aed30d2c9fec66feb6c8f81494bb094b0e4d18cb
+  metadata.gz: 79301d111fb0aeb6db055ffadf61d6ea5d6cdad0
+  data.tar.gz: a3b94bc08132734123e507249c8f878faff9ad97
 SHA512:
-  metadata.gz: fe887c1c0ba2f691dab8fd7bb0b6cc52b7f6491c77e379b2885de1eed9e3e2bde3e21193ca86e3d7c74246a643f6e6fff06d138f6faba7f3cd88772561e4a775
-  data.tar.gz: f6025778c94470895a1d030a2898b4d5d7bf4679a2c3b5ab3c2bc1cd670949c1839b123526511a27fef4430a6bc90c4f3e4f108fc090b8bd426c94dc9b05de94
+  metadata.gz: 1a2db9f6bf5fd4c5d9e860b22b6d525831f3f5186edddb7f32066cc2e156706da76878d2e701bcfb902f2336ef8311a6b5a2b5d7dd39c812175db00ac5722578
+  data.tar.gz: 21c73bef77eff8eddcaae7ddf6e0fda654ff365b78bcbde1c3b7fb1af3987b8f515334ce8cfe217aedfd06262092ebe76935e9a25026dc951801f5eb9177469f

data/Gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.flydata.com"
 
 gem "rest-client", '~> 1.6', '>= 1.6.7'
 gem "i18n", '~> 0.6', '>= 0.6.5'
-gem "activesupport", '~> 4.0', '>= 4.0.0'
+gem "activesupport", '~> 4.0.0'
 gem "json", '~> 1.8', '>= 1.8.0'
 gem "highline", '~> 1.6', '>= 1.6.19'
 gem "fluentd", "0.10.46"
@@ -20,7 +20,7 @@ group :development do
   #gem "autotest-standalone"
   #gem "autotest-notification"
   gem 'timecop', '~> 0.7', '>= 0.7.1'
-  gem "sqlite3", '~> 0.1', '>= 0.1.1'
+  gem "sqlite3", '~> 1.3', '>= 1.3.9'
   gem 'ruby-prof', '~> 0.15', '>= 0.15.1'
   gem 'activemodel', '~> 4.0', '>= 4.0.0'
   gem 'activerecord', '~> 4.0', '>= 4.0.0'

data/Gemfile.lock

@@ -2,27 +2,28 @@ GEM
   remote: http://rubygems.org/
   remote: https://rubygems.flydata.com/
   specs:
-    activemodel (4.1.4)
-      activesupport (= 4.1.4)
-      builder (~> 3.1)
-    activerecord (4.1.4)
-      activemodel (= 4.1.4)
-      activesupport (= 4.1.4)
-      arel (~> 5.0.0)
-    activesupport (4.1.4)
+    activemodel (4.0.8)
+      activesupport (= 4.0.8)
+      builder (~> 3.1.0)
+    activerecord (4.0.8)
+      activemodel (= 4.0.8)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.8)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.8)
       i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
       thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
+      tzinfo (~> 0.3.37)
     addressable (2.3.6)
-    arel (5.0.1.20140414130214)
-    builder (3.2.2)
+    arel (4.0.2)
+    builder (3.1.4)
     cool.io (1.2.4)
     diff-lcs (1.2.5)
     faraday (0.8.9)
       multipart-post (~> 1.2.0)
-    ffi (1.9.3)
     fluent-plugin-mysql-binlog (0.0.2)
       activesupport
       fluentd
@@ -60,7 +61,7 @@ GEM
     kodama (0.1.1)
       ruby-binlog (>= 0.1.9)
     mime-types (2.3)
-    minitest (5.4.0)
+    minitest (4.7.5)
     msgpack (0.5.8)
     multi_json (1.10.1)
     multi_xml (0.5.5)
@@ -100,14 +101,12 @@ GEM
     ruby-prof (0.15.1)
     sigdump (0.2.2)
     slop (3.6.0)
-    sqlite3 (0.1.1)
-      ffi (>= 0.6.3)
+    sqlite3 (1.3.9)
     thread_safe (0.3.4)
     timecop (0.7.1)
     treetop (1.5.3)
       polyglot (~> 0.3)
-    tzinfo (1.2.1)
-      thread_safe (~> 0.1)
+    tzinfo (0.3.41)
     yajl-ruby (1.2.1)
 
 PLATFORMS
@@ -116,7 +115,7 @@ PLATFORMS
 DEPENDENCIES
   activemodel (~> 4.0, >= 4.0.0)
   activerecord (~> 4.0, >= 4.0.0)
-  activesupport (~> 4.0, >= 4.0.0)
+  activesupport (~> 4.0.0)
   fluent-plugin-mysql-binlog (~> 0.0, >= 0.0.2)
   fluentd (= 0.10.46)
   highline (~> 1.6, >= 1.6.19)
@@ -130,6 +129,6 @@ DEPENDENCIES
   ruby-binlog (~> 1.0, >= 1.0.1)
   ruby-prof (~> 0.15, >= 0.15.1)
   slop (~> 3.4, >= 3.4.6)
-  sqlite3 (~> 0.1, >= 0.1.1)
+  sqlite3 (~> 1.3, >= 1.3.9)
   timecop (~> 0.7, >= 0.7.1)
   treetop (~> 1.5, >= 1.5.3)

data/VERSION

@@ -1 +1 @@
-0.1.13
+0.1.15

data/flydata.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: flydata 0.1.13 ruby lib
+# stub: flydata 0.1.15 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.1.13"
+  s.version = "0.1.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Koichi Fujikawa"]
-  s.date = "2014-08-05"
+  s.date = "2014-08-11"
   s.description = "FlyData Command Line Interface"
   s.email = "sysadmin@flydata.co"
   s.executables = ["fdmysqldump", "flydata"]
@@ -115,7 +115,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rest-client>, [">= 1.6.7", "~> 1.6"])
       s.add_runtime_dependency(%q<i18n>, [">= 0.6.5", "~> 0.6"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 4.0.0", "~> 4.0"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 4.0.0"])
       s.add_runtime_dependency(%q<json>, [">= 1.8.0", "~> 1.8"])
       s.add_runtime_dependency(%q<highline>, [">= 1.6.19", "~> 1.6"])
       s.add_runtime_dependency(%q<fluentd>, ["= 0.10.46"])
@@ -127,7 +127,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, [">= 1.8.8", "~> 1.8"])
       s.add_development_dependency(%q<rspec>, ["~> 3.0"])
       s.add_development_dependency(%q<timecop>, [">= 0.7.1", "~> 0.7"])
-      s.add_development_dependency(%q<sqlite3>, [">= 0.1.1", "~> 0.1"])
+      s.add_development_dependency(%q<sqlite3>, [">= 1.3.9", "~> 1.3"])
       s.add_development_dependency(%q<ruby-prof>, [">= 0.15.1", "~> 0.15"])
       s.add_development_dependency(%q<activemodel>, [">= 4.0.0", "~> 4.0"])
       s.add_development_dependency(%q<activerecord>, [">= 4.0.0", "~> 4.0"])
@@ -135,7 +135,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<rest-client>, [">= 1.6.7", "~> 1.6"])
       s.add_dependency(%q<i18n>, [">= 0.6.5", "~> 0.6"])
-      s.add_dependency(%q<activesupport>, [">= 4.0.0", "~> 4.0"])
+      s.add_dependency(%q<activesupport>, ["~> 4.0.0"])
       s.add_dependency(%q<json>, [">= 1.8.0", "~> 1.8"])
       s.add_dependency(%q<highline>, [">= 1.6.19", "~> 1.6"])
       s.add_dependency(%q<fluentd>, ["= 0.10.46"])
@@ -147,7 +147,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, [">= 1.8.8", "~> 1.8"])
       s.add_dependency(%q<rspec>, ["~> 3.0"])
       s.add_dependency(%q<timecop>, [">= 0.7.1", "~> 0.7"])
-      s.add_dependency(%q<sqlite3>, [">= 0.1.1", "~> 0.1"])
+      s.add_dependency(%q<sqlite3>, [">= 1.3.9", "~> 1.3"])
       s.add_dependency(%q<ruby-prof>, [">= 0.15.1", "~> 0.15"])
       s.add_dependency(%q<activemodel>, [">= 4.0.0", "~> 4.0"])
       s.add_dependency(%q<activerecord>, [">= 4.0.0", "~> 4.0"])
@@ -156,7 +156,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<rest-client>, [">= 1.6.7", "~> 1.6"])
     s.add_dependency(%q<i18n>, [">= 0.6.5", "~> 0.6"])
-    s.add_dependency(%q<activesupport>, [">= 4.0.0", "~> 4.0"])
+    s.add_dependency(%q<activesupport>, ["~> 4.0.0"])
     s.add_dependency(%q<json>, [">= 1.8.0", "~> 1.8"])
     s.add_dependency(%q<highline>, [">= 1.6.19", "~> 1.6"])
     s.add_dependency(%q<fluentd>, ["= 0.10.46"])
@@ -168,7 +168,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, [">= 1.8.8", "~> 1.8"])
     s.add_dependency(%q<rspec>, ["~> 3.0"])
     s.add_dependency(%q<timecop>, [">= 0.7.1", "~> 0.7"])
-    s.add_dependency(%q<sqlite3>, [">= 0.1.1", "~> 0.1"])
+    s.add_dependency(%q<sqlite3>, [">= 1.3.9", "~> 1.3"])
     s.add_dependency(%q<ruby-prof>, [">= 0.15.1", "~> 0.15"])
     s.add_dependency(%q<activemodel>, [">= 4.0.0", "~> 4.0"])
     s.add_dependency(%q<activerecord>, [">= 4.0.0", "~> 4.0"])

data/lib/flydata/command/sync.rb

@@ -17,6 +17,12 @@ module Flydata
       STATUS_PARSING = 'PARSING'
       STATUS_COMPLETE = 'COMPLETE'
 
+      def self.slop
+        Slop.new do
+          on 'c', 'skip-cleanup', 'Skip server cleanup'
+        end
+      end
+
       def run(*tables)
         sender = Flydata::Command::Sender.new
         if (sender.process_exist?)
@@ -310,7 +316,7 @@ Dump file saves contents of your tables temporarily.  Make sure you have enough
           puts "Resuming... Last processed table: #{option[:table_name]}"
         else
           #If its a new sync, ensure server side resources are clean
-          cleanup_sync_server(de, de['mysql_data_entry_preference']['tables'].split(','))
+          cleanup_sync_server(de, de['mysql_data_entry_preference']['tables'].split(',')) unless opts.skip_cleanup?
         end
         puts "Sending data to FlyData Server..."
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.15
 platform: ruby
 authors:
 - Koichi Fujikawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -54,22 +54,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -284,20 +278,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 1.3.9
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 1.3.9
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement