filecluster 0.5.14 → 0.5.15

data/test/helper.rb

@@ -5,14 +5,20 @@ require "test/unit"
 require "shoulda-context"
 require "filecluster"
 require "mocha/setup"
+require "byebug"
 
 TEST_DATABASE = 'fc_test'
 TEST_USER     = 'root'
 TEST_PASSWORD = ''
-
-FC::DB.connect_by_config(:username => TEST_USER, :password => TEST_PASSWORD)
+# $MYSQL_HOST -u $MYSQL_USER -p $MYSQL_PASSWORD -d $MYSQL_DATABASE
+FC::DB.connect_by_config(:username =>  TEST_USER,    :password => TEST_PASSWORD, :host => ENV['MYSQL_HOST'] )
 FC::DB.query("DROP DATABASE IF EXISTS #{TEST_DATABASE}")
 FC::DB.query("CREATE DATABASE #{TEST_DATABASE}")
 FC::DB.query("USE #{TEST_DATABASE}")
 FC::DB.init_db(true)
 FC::DB.options[:database] = TEST_DATABASE
+
+
+def ssh_hostname
+  ENV['SSH_HOST'] || 'localhost'
+end

data/test/storage_sync_test.rb

@@ -7,17 +7,17 @@ class StorageSyncTest < Test::Unit::TestCase
       # tmp fake storage dir
       `rm -rf /tmp/host*-sd*`
       `mkdir -p /tmp/host1-sda/`
-      
+
       # test files to copy
       @@test_file_path = '/tmp/fc_test_file'
       `dd if=/dev/urandom of=#{@@test_file_path} bs=1M count=1 2>&1`
-      
-      @@storage = FC::Storage.new(:name => 'host1-sda', :host => 'localhost', :path => '/tmp/host1-sda/', :size_limit => 1000000000, :check_time => Time.new.to_i)
+
+      @@storage = FC::Storage.new(:name => 'host1-sda', :host => ssh_hostname, :path => '/tmp/host1-sda/', :size_limit => 1000000000, :check_time => Time.new.to_i)
       @@storage.save
       @@policy = FC::Policy.new(:create_storages => 'host1-sda', :copies => 1, :name => 'policy 1')
       @@policy.save
     end
-    
+
     def shutdown
       FC::DB.query("DELETE FROM items_storages")
       FC::DB.query("DELETE FROM items")
@@ -27,7 +27,7 @@ class StorageSyncTest < Test::Unit::TestCase
       `rm -rf #{@@test_file_path}`
     end
   end
-  
+
   should "sync_all" do
     assert_nothing_raised { @item1 = FC::Item.create_from_local(@@test_file_path, 'a/test1', @@policy, {:tag => 'test'}) }
     assert_nothing_raised { @item2 = FC::Item.create_from_local(@@test_file_path, 'a/b/test2', @@policy, {:tag => 'test'}) }
@@ -42,9 +42,9 @@ class StorageSyncTest < Test::Unit::TestCase
     `mkdir /tmp/host1-sda/test_dir`
     `cp #{@@test_file_path} /tmp/host1-sda/test_dir/t1`
     `cp #{@@test_file_path} /tmp/host1-sda/test_dir/t2`
-    
+
     make_storages_sync(@@storage, true, true, true)
-    
+
     @item1.reload
     @item2.reload
     @item3.reload

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.5.14
+  version: 0.5.15
 platform: ruby
 authors:
 - sh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2018-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -94,6 +94,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.3
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Distributed storage
 email:
 - cntyrf@gmail.com
@@ -105,16 +133,26 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ssh/.keep"
+- Dockerfile
 - Gemfile
 - LICENSE
 - README.md
+- README_RU.md
 - Rakefile
 - TODO
 - bin/fc-daemon
 - bin/fc-manage
 - bin/fc-setup-db
+- docker-compose-mysql56.yaml
+- docker-compose.yaml
+- docker/Dockerfile.sshd
+- docker/development.env
+- entrypoint.sh
 - filecluster.gemspec
+- lib/autosync.rb
 - lib/daemon.rb
+- lib/daemon/autosync_thread.rb
 - lib/daemon/base_thread.rb
 - lib/daemon/check_thread.rb
 - lib/daemon/copy_task_thread.rb
@@ -133,7 +171,9 @@ files:
 - lib/fc/var.rb
 - lib/fc/version.rb
 - lib/filecluster.rb
+- lib/iostat.rb
 - lib/manage.rb
+- lib/manage/autosync.rb
 - lib/manage/copy_rules.rb
 - lib/manage/copy_speed.rb
 - lib/manage/item.rb
@@ -142,6 +182,7 @@ files:
 - lib/manage/storages.rb
 - lib/manage/var.rb
 - lib/utils.rb
+- test/autosync_test.rb
 - test/base_test.rb
 - test/copy_rule_test.rb
 - test/daemon_test.rb
@@ -179,6 +220,7 @@ signing_key:
 specification_version: 4
 summary: Distributed storage
 test_files:
+- test/autosync_test.rb
 - test/base_test.rb
 - test/copy_rule_test.rb
 - test/daemon_test.rb