gitdocs 0.5.0.pre1 → 0.5.0.pre2

data/test/runner_test.rb

@@ -1,25 +1,142 @@
 require File.expand_path('../test_helper', __FILE__)
 
 describe 'gitdocs runner' do
-  it 'should clone files' do
-    with_clones(3) do |clone1, clone2, clone3|
-      File.open(File.join(clone1, 'test'), 'w') { |f| f << 'testing' }
-      sleep 3
-      assert_equal 'testing', File.read(File.join(clone1, 'test'))
-      assert_equal 'testing', File.read(File.join(clone2, 'test'))
-      assert_equal 'testing', File.read(File.join(clone3, 'test'))
+  before { ENV['TEST'] = 'true' }
+
+  describe 'syncing' do
+    it 'should clone files' do
+      with_clones(3) do |clone1, clone2, clone3|
+        File.open(File.join(clone1, 'test'), 'w') { |f| f << 'testing' }
+        sleep 3
+        assert_equal 'testing', File.read(File.join(clone1, 'test'))
+        assert_equal 'testing', File.read(File.join(clone2, 'test'))
+        assert_equal 'testing', File.read(File.join(clone3, 'test'))
+      end
+    end
+
+    it 'should resolve conflicts files' do
+      with_clones(3) do |clone1, clone2, clone3|
+        File.open(File.join(clone1, 'test.txt'), 'w') { |f| f << 'testing' }
+        sleep 3
+        File.open(File.join(clone1, 'test.txt'), 'w') { |f| f << "testing\n1" }
+        File.open(File.join(clone2, 'test.txt'), 'w') { |f| f << "testing\n2" }
+        sleep 3
+        assert_includes 2..3, Dir[File.join(clone2, '*.txt')].to_a.size
+        assert_includes 2..3, Dir[File.join(clone3, '*.txt')].to_a.size
+      end
     end
   end
 
-  it 'should resolve conflicts files' do
-    with_clones(3) do |clone1, clone2, clone3|
-      File.open(File.join(clone1, 'test.txt'), 'w') { |f| f << 'testing' }
-      sleep 3
-      File.open(File.join(clone1, 'test.txt'), 'w') { |f| f << "testing\n1" }
-      File.open(File.join(clone2, 'test.txt'), 'w') { |f| f << "testing\n2" }
-      sleep 3
-      assert_includes 2..3, Dir[File.join(clone2, '*.txt')].to_a.size
-      assert_includes 2..3, Dir[File.join(clone3, '*.txt')].to_a.size
+  describe 'public methods' do
+    let(:runner) { Gitdocs::Runner.new(share)}
+
+    let(:share)      { stub(polling_interval: 1, notification: true) }
+    let(:notifier)   { stub }
+    let(:repository) { stub(root: 'root_path') }
+    before do
+      Gitdocs::Notifier.stubs(:new).with(true).returns(notifier)
+      Gitdocs::Repository.stubs(:new).with(share).returns(repository)
+    end
+
+    describe '#root' do
+      subject { runner.root }
+      it { subject.must_equal 'root_path' }
+    end
+
+    describe '#sync_changes' do
+      subject { runner.sync_changes }
+
+      before { repository.expects(:pull).returns(pull_result) }
+
+      describe 'when invalid' do
+        let(:pull_result) { nil }
+        it { subject.must_equal nil }
+      end
+
+      describe 'when no remote present' do
+        let(:pull_result) { :no_remote }
+        it { subject.must_equal nil }
+      end
+
+      describe 'when merge is conflicted' do
+        let(:pull_result) { ['file'] }
+        before do
+          notifier.expects(:warn).with(
+            'There were some conflicts',
+            "* file"
+          )
+          runner.expects(:push_changes)
+        end
+        it { subject.must_equal nil }
+      end
+
+      describe 'when merge is ok' do
+        let(:pull_result) { :ok }
+        before do
+          runner.instance_variable_set(:@last_synced_revision, :oid)
+          repository.stubs(:current_oid).returns(:next_oid)
+          repository.stubs(:author_count).with(:oid).returns('Alice' => 1, 'Bob' => 2)
+          notifier.expects(:info).with(
+            'Updated with 3 changes',
+            "In 'root_path':\n* Alice (1 change)\n* Bob (2 changes)"
+          )
+          runner.expects(:push_changes)
+        end
+        it { subject.must_equal nil }
+        it { subject ; runner.instance_variable_get(:@last_synced_revision).must_equal :next_oid }
+      end
+    end
+
+    describe '#push_changes' do
+      subject { runner.push_changes }
+
+      before { repository.expects(:push).returns(push_result) }
+
+      describe 'when invalid' do
+        let(:push_result) { nil }
+        it { subject.must_equal nil }
+      end
+
+      describe 'when no remote present' do
+        let(:push_result) { :no_remote }
+        it { subject.must_equal nil }
+      end
+
+      describe 'when nothing happened' do
+        let(:push_result) { :nothing }
+        it { subject.must_equal nil }
+      end
+
+      describe 'when there is an error' do
+        let(:push_result) { 'error' }
+        before do
+          notifier.expects(:error)
+            .with('BAD Could not push changes in root_path', 'error')
+        end
+        it { subject.must_equal nil }
+      end
+
+      describe 'when push is conflicted' do
+        let(:push_result) { :conflict }
+        before do
+          notifier.expects(:warn)
+            .with('There was a conflict in root_path, retrying', '')
+        end
+        it { subject.must_equal nil }
+      end
+
+      describe 'when merge is ok' do
+        let(:push_result) { :ok }
+        before do
+          runner.instance_variable_set(:@last_synced_revision, :oid)
+          repository.stubs(:current_oid).returns(:next_oid)
+          repository.stubs(:author_count).with(:oid).returns('Alice' => 1, 'Bob' => 2)
+          notifier.expects(:info)
+            .with('Pushed 3 changes', "'root_path' has been pushed")
+        end
+        it { subject.must_equal nil }
+        it { subject ; runner.instance_variable_get(:@last_synced_revision).must_equal :next_oid }
+      end
     end
   end
 end

data/test/test_helper.rb

@@ -1,4 +1,3 @@
-ENV['TEST'] = 'true'
 require 'rubygems'
 require 'minitest/autorun'
 $LOAD_PATH.unshift File.expand_path('../../lib')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitdocs
 version: !ruby/object:Gem::Version
-  version: 0.5.0.pre1
+  version: 0.5.0.pre2
 platform: ruby
 authors:
 - Josh Hull
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: joshbuddy-guard
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -249,6 +249,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.4.2
+- !ruby/object:Gem::Dependency
+  name: rugged
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.19.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -319,6 +333,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  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: Open-source Dropbox using Ruby and Git.
 email:
 - joshbuddy@gmail.com
@@ -348,6 +376,7 @@ files:
 - lib/gitdocs/migration/004_add_index_for_path.rb
 - lib/gitdocs/migration/005_add_start_web_frontend.rb
 - lib/gitdocs/migration/006_add_web_port_to_config.rb
+- lib/gitdocs/notifier.rb
 - lib/gitdocs/public/css/app.css
 - lib/gitdocs/public/css/bootstrap.css
 - lib/gitdocs/public/css/coderay.css
@@ -397,6 +426,7 @@ files:
 - lib/gitdocs/public/js/settings.js
 - lib/gitdocs/public/js/util.js
 - lib/gitdocs/rendering.rb
+- lib/gitdocs/repository.rb
 - lib/gitdocs/runner.rb
 - lib/gitdocs/server.rb
 - lib/gitdocs/version.rb
@@ -412,6 +442,12 @@ files:
 - lib/gitdocs/views/settings.haml
 - lib/img/icon.png
 - test/configuration_test.rb
+- test/integration/full_sync_test.rb
+- test/integration/share_management_test.rb
+- test/integration/status_test.rb
+- test/integration/test_helper.rb
+- test/notifier_test.rb
+- test/repository_test.rb
 - test/runner_test.rb
 - test/test_helper.rb
 homepage: http://engineering.gomiso.com/2011/11/30/collaborate-and-track-tasks-with-ease-using-gitdocs/
@@ -439,5 +475,11 @@ specification_version: 4
 summary: Open-source Dropbox using Ruby and Git
 test_files:
 - test/configuration_test.rb
+- test/integration/full_sync_test.rb
+- test/integration/share_management_test.rb
+- test/integration/status_test.rb
+- test/integration/test_helper.rb
+- test/notifier_test.rb
+- test/repository_test.rb
 - test/runner_test.rb
 - test/test_helper.rb