flydata 0.2.15 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6cd04787878b2914745754010d02ec5f9abafae
-  data.tar.gz: dc7750c6a4cc5d5891cade50d5b3f8d2fd67ad6c
+  metadata.gz: d79c609aea9b48dabaf04f5bb1e45d702bb1ccd8
+  data.tar.gz: bf30492871ede7150012351b0092af04c273315f
 SHA512:
-  metadata.gz: c4dfb4894039ef88f6763a618151a714d3bdc02d7373c35d4ad3791f9f91fd33d959a435e1b4f50dc711ba1587bd8396dcb2b8b5b496e97200c1557cf919634d
-  data.tar.gz: 661851497f9b3b7e5c842a1e0341e3ce79b9040b2f29d53c229c0bd084e2895fed080be86e00ea4b9212d8c8fce62cfbfecf88078309c68226ea5450f6b17e8e
+  metadata.gz: a271b10b00eb8897e51853b74d9ea19cde03f89457dbc38709e9c2a6f889de75680c76f963a67cd3cf2f822f72203d216f59bd60f8e384e9b329b78a2941a89f
+  data.tar.gz: d9985f166994b103fff6a10a7e842f67d03aebd4104c3c758ad3b64a8b849993f6ea580502bb7830a9a72caf1bc3029b6afa851684854708d406c61922c38768

data/VERSION

@@ -1 +1 @@
-0.2.15
+0.2.16

data/flydata.gemspec

@@ -2,16 +2,14 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: flydata 0.2.15 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.2.15"
+  s.version = "0.2.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
   s.authors = ["Koichi Fujikawa", "Masashi Miyazaki", "Matthew Luu", "Mak Inada", "Sriram NS"]
-  s.date = "2014-11-18"
+  s.date = "2014-11-19"
   s.description = "FlyData Agent"
   s.email = "sysadmin@flydata.com"
   s.executables = ["fdmysqldump", "flydata", "serverinfo"]
@@ -124,7 +122,8 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://flydata.com/"
   s.licenses = ["All right reserved."]
-  s.rubygems_version = "2.2.2"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "2.0.14"
   s.summary = "FlyData Agent"
 
   if s.respond_to? :specification_version then

data/lib/flydata/command/sync.rb

@@ -214,7 +214,7 @@ module Flydata
         puts message unless message.nil? || message.empty?
       end
 
-      DDL_DUMP_CMD_TEMPLATE = "mysqldump --protocol=tcp -d -h %s -P %s -u %s %s %s %s"
+      DDL_DUMP_CMD_TEMPLATE = "MYSQL_PWD=\"%s\" mysqldump --protocol=tcp -d -h %s -P %s -u %s %s %s"
       def do_generate_table_ddl(de)
         if `which mysqldump`.empty?
           raise "mysqldump is not installed.  mysqldump is required to run the command"
@@ -226,10 +226,10 @@ module Flydata
 
         mp = de['mysql_data_entry_preference']
         params = []
+        params << mp['password']
         if !mp['host'].empty? then params << mp['host'] else raise "MySQL `host` is neither defined in the data entry nor the local config file" end
         params << (mp['port'] or '3306')
         if !mp['username'].empty? then params << mp['username'] else raise "MySQL `username` is neither defined in the data entry nor the local config file" end
-        params << (mp['password'].to_s.empty? ? "" : "-p#{mp['password']}")
         if !mp['database'].empty? then params << mp['database'] else raise "`database` is neither defined in the data entry nor the local config file" end
         if !mp['tables'].empty? then params << mp['tables'].gsub(/,/, ' ') else raise "`tables` (or `tables_append_only`) is neither defined in the data entry nor the local config file" end
 

data/lib/flydata/compatibility_check.rb

@@ -110,8 +110,7 @@ module Flydata
     end
 
     def check_mysql_protocol_tcp_compat
-      query = "mysql -u #{@db_opts[:username]} -h #{@db_opts[:host]} -P #{@db_opts[:port]} #{@db_opts[:database]} -e \"SHOW GRANTS;\" --protocol=tcp"
-      query << " -p#{@db_opts[:password]}" unless @db_opts[:password].to_s.empty?
+      query = "MYSQL_PWD=\"#{@db_opts[:password]}\" mysql -u #{@db_opts[:username]} -h #{@db_opts[:host]} -P #{@db_opts[:port]} #{@db_opts[:database]} -e \"SHOW GRANTS;\" --protocol=tcp"
 
       Open3.popen3(query) do |stdin, stdout, stderr|
         stdin.close

data/lib/flydata/parser/mysql/dump_parser.rb

@@ -38,17 +38,16 @@ module Flydata
 
       class MysqlDumpGenerator
         # host, port, username, password, database, tables
-        MYSQL_DUMP_CMD_TEMPLATE = "mysqldump --protocol=tcp -h %s -P %s -u%s %s --skip-lock-tables --single-transaction --hex-blob %s %s %s"
+        MYSQL_DUMP_CMD_TEMPLATE = "MYSQL_PWD=\"%s\" mysqldump --default-character-set=utf8 --protocol=tcp -h %s -P %s -u%s --skip-lock-tables --single-transaction --hex-blob %s %s %s"
         EXTRA_MYSQLDUMP_PARAMS = ""
         def initialize(conf)
-          password = conf['password'].to_s.empty? ? "" : "-p#{conf['password']}"
           tables = if conf['tables']
                      conf['tables'].split(',').join(' ')
                    else
                      ''
                    end
           @dump_cmd = MYSQL_DUMP_CMD_TEMPLATE %
-            [conf['host'], conf['port'], conf['username'], password, self.class::EXTRA_MYSQLDUMP_PARAMS, conf['database'], tables]
+            [conf['password'], conf['host'], conf['port'], conf['username'], self.class::EXTRA_MYSQLDUMP_PARAMS, conf['database'], tables]
           @db_opts = [:host, :port, :username, :password, :database].inject({}) {|h, sym| h[sym] = conf[sym.to_s]; h}
         end
         def dump(file_path)

data/spec/flydata/command/sync_spec.rb

@@ -56,7 +56,7 @@ module Flydata
         context 'with full options' do
           it 'issues mysqldump command with expected parameters' do
             expect(Open3).to receive(:popen3).with(
-             'mysqldump --protocol=tcp -d -h localhost -P 3306 -u masashi -pwelcome sync_test table1  table2')
+             'MYSQL_PWD="welcome" mysqldump --protocol=tcp -d -h localhost -P 3306 -u masashi sync_test table1  table2')
             subject.send(:do_generate_table_ddl, default_data_entry)
           end
         end
@@ -78,7 +78,7 @@ module Flydata
           end
           it "uses the default port" do
             expect(Open3).to receive(:popen3).with(
-             'mysqldump --protocol=tcp -d -h localhost -P 3306 -u masashi -pwelcome sync_test table1  table2')
+             'MYSQL_PWD="welcome" mysqldump --protocol=tcp -d -h localhost -P 3306 -u masashi sync_test table1  table2')
             subject.send(:do_generate_table_ddl, default_data_entry)
           end
         end
@@ -88,7 +88,7 @@ module Flydata
           end
           it "uses the specified port" do
             expect(Open3).to receive(:popen3).with(
-             'mysqldump --protocol=tcp -d -h localhost -P 1234 -u masashi -pwelcome sync_test table1  table2')
+             'MYSQL_PWD="welcome" mysqldump --protocol=tcp -d -h localhost -P 1234 -u masashi sync_test table1  table2')
             subject.send(:do_generate_table_ddl, default_data_entry)
           end
         end
@@ -108,9 +108,20 @@ module Flydata
           before do
             default_data_entry['mysql_data_entry_preference'].delete('password')
           end
-          it "call mysqldump without -p option" do
+          it "call mysqldump without MYSQL_PW set" do
             expect(Open3).to receive(:popen3).with(
-             'mysqldump --protocol=tcp -d -h localhost -P 3306 -u masashi  sync_test table1  table2')
+             'MYSQL_PWD="" mysqldump --protocol=tcp -d -h localhost -P 3306 -u masashi sync_test table1  table2')
+            subject.send(:do_generate_table_ddl, default_data_entry)
+          end
+        end
+        context 'with password containing symbols' do
+          before do
+            default_data_entry['mysql_data_entry_preference'].delete('password')
+            default_data_entry['mysql_data_entry_preference']['password']="welcome&!@^@#^"
+          end
+          it "call mysqldump with MYSQL_PW set with correct symbols" do
+            expect(Open3).to receive(:popen3).with(
+             'MYSQL_PWD="welcome&!@^@#^" mysqldump --protocol=tcp -d -h localhost -P 3306 -u masashi sync_test table1  table2')
             subject.send(:do_generate_table_ddl, default_data_entry)
           end
         end

data/spec/flydata/parser/mysql/dump_parser_spec.rb

@@ -19,7 +19,7 @@ module Flydata
         describe '#initialize' do
           context 'with password' do
             subject { default_dump_generator.instance_variable_get(:@dump_cmd) }
-            it { is_expected.to eq('mysqldump --protocol=tcp -h localhost -P 3306 -uadmin -ppass --skip-lock-tables ' +
+            it { is_expected.to eq('MYSQL_PWD="pass" mysqldump --default-character-set=utf8 --protocol=tcp -h localhost -P 3306 -uadmin --skip-lock-tables ' +
                                    '--single-transaction --hex-blob --flush-logs --master-data=2 dev users groups') }
           end
           context 'without password' do
@@ -27,7 +27,7 @@ module Flydata
               MysqlDumpGeneratorMasterData.new(default_conf.merge({'password' => ''}))
             end
             subject { dump_generator.instance_variable_get(:@dump_cmd) }
-            it { is_expected.to eq('mysqldump --protocol=tcp -h localhost -P 3306 -uadmin  --skip-lock-tables ' +
+            it { is_expected.to eq('MYSQL_PWD="" mysqldump --default-character-set=utf8 --protocol=tcp -h localhost -P 3306 -uadmin --skip-lock-tables ' +
                                    '--single-transaction --hex-blob --flush-logs --master-data=2 dev users groups') }
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.16
 platform: ruby
 authors:
 - Koichi Fujikawa
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -524,7 +524,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: FlyData Agent