gitdocs 0.5.0 → 0.6.0

data/lib/gitdocs/runner.rb

@@ -1,108 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-module Gitdocs
-  class Runner
-    def self.start_all(shares)
-      runners = shares.map { |share| Runner.new(share) }
-      runners.each(&:run)
-      runners
-    end
-
-    def initialize(share)
-      @share = share
-      @polling_interval = share.polling_interval
-      @notifier         = Gitdocs::Notifier.new(@share.notification)
-      @repository       = Gitdocs::Repository.new(share)
-    end
-
-    def root
-      @repository.root
-    end
-
-    def run
-      return false unless @repository.valid?
-
-      @last_synced_revision = @repository.current_oid
-
-      mutex = Mutex.new
-
-      @notifier.info('Running gitdocs!', "Running gitdocs in '#{root}'")
-
-      # Pull changes from remote repository
-      syncer = proc do
-        EM.defer(proc do
-          mutex.synchronize { sync_changes }
-        end, proc do
-          EM.add_timer(@polling_interval) do
-            syncer.call
-          end
-        end)
-      end
-      syncer.call
-      # Listen for changes in local repository
-
-      EM.defer(proc do
-        listener = Guard::Listener.select_and_init(
-          root, watch_all_modifications: true
-        )
-        listener.on_change do |directories|
-          directories.uniq!
-          directories.delete_if { |d| d =~ /\/\.git/ }
-          unless directories.empty?
-            EM.next_tick do
-              EM.defer(proc do
-                mutex.synchronize { sync_changes }
-              end, proc {})
-            end
-          end
-        end
-        listener.start
-      end, proc { EM.stop_reactor })
-    end
-
-    def clear_state
-      @state = nil
-    end
-
-    def sync_changes
-      # Commit #################################################################
-      @repository.commit if @share.sync_type == 'full'
-
-      # Fetch ##################################################################
-      fetch_result = @repository.fetch
-      return unless fetch_result == :ok
-      return if @share.sync_type == 'fetch'
-
-      # Merge ##################################################################
-      merge_result = @repository.merge
-      merge_result = latest_author_count if merge_result == :ok
-      @notifier.merge_notification(merge_result, root)
-      return if merge_result.is_a?(String)
-
-      # Push ###################################################################
-      result = @repository.push
-      result = latest_author_count if result == :ok
-      @notifier.push_notification(result, root)
-    rescue => e
-      # Rescue any standard exceptions which come from the push related
-      # commands. This will prevent problems on a single share from killing
-      # the entire daemon.
-      @notifier.error("Unexpected error syncing changes in #{root}", "#{e}")
-    end
-
-    ############################################################################
-
-    private
-
-    # Update the author count for the last synced changes, and then update the
-    # last synced revision id.
-    #
-    # @return [Hash<String,Int>]
-    def latest_author_count
-      last_oid = @last_synced_revision
-      @last_synced_revision = @repository.current_oid
-
-      @repository.author_count(last_oid)
-    end
-  end
-end

data/lib/gitdocs/server.rb

@@ -1,62 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-require 'thin'
-require 'gitdocs/browser_app'
-require 'gitdocs/settings_app'
-
-module Gitdocs
-  class Server
-    def initialize(manager, port = 8888, repositories)
-      @manager      = manager
-      @port         = port.to_i
-      @repositories = repositories
-      @search       = Gitdocs::Search.new(repositories)
-    end
-
-    def self.start_and_wait(manager, override_port, repositories)
-      return false unless manager.start_web_frontend
-
-      web_port = override_port || manager.web_frontend_port
-      server = Server.new(manager, web_port, repositories)
-      server.start
-      server.wait_for_start
-      true
-    end
-
-    def start
-      Gitdocs::SettingsApp.set :manager, @manager
-      Gitdocs::BrowserApp.set :repositories, @repositories
-
-      Thin::Logging.debug = @manager.debug
-      Thin::Server.start('127.0.0.1', @port) do
-        use Rack::Static,
-          urls: %w(/css /js /img /doc),
-          root: File.expand_path('../public', __FILE__)
-        use Rack::MethodOverride
-
-        map('/settings') { run Gitdocs::SettingsApp }
-        map('/') { run Gitdocs::BrowserApp }
-      end
-    end
-
-    def wait_for_start
-      wait_for_web_server = proc do
-        i = 0
-        begin
-          TCPSocket.open('127.0.0.1', @port).close
-          @manager.log('Web server running!')
-        rescue Errno::ECONNREFUSED
-          sleep 0.2
-          i += 1
-          if i <= 20
-            @manager.log('Retrying web server loop...')
-            retry
-          else
-            @manager.log('Web server failed to start')
-          end
-        end
-      end
-      EM.defer(wait_for_web_server)
-    end
-  end
-end

data/test/integration/full_sync_test.rb

@@ -1,66 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-require File.expand_path('../test_helper', __FILE__)
-
-describe 'fully synchronizing repositories' do
-  before do
-    git_clone_and_gitdocs_add(git_init_remote, 'clone1', 'clone2', 'clone3')
-    start_daemon
-  end
-
-  it 'should sync new files' do
-    write_file('clone1/newfile', 'testing')
-    wait_for_clean_workdir('clone1')
-
-    wait_for_exact_file_content('clone1/newfile', 'testing')
-    wait_for_exact_file_content('clone2/newfile', 'testing')
-    wait_for_exact_file_content('clone3/newfile', 'testing')
-  end
-
-  it 'should sync changes to an existing file' do
-    write_file('clone1/file', 'testing')
-    wait_for_clean_workdir('clone1')
-
-    wait_for_exact_file_content('clone3/file', 'testing')
-    append_to_file('clone3/file', "\nfoobar")
-    wait_for_clean_workdir('clone3')
-
-    wait_for_exact_file_content('clone1/file', "testing\nfoobar")
-    wait_for_exact_file_content('clone2/file', "testing\nfoobar")
-    wait_for_exact_file_content('clone3/file', "testing\nfoobar")
-  end
-
-  it 'should sync empty directories' do
-    in_current_dir { _mkdir('clone1/empty_dir') }
-    wait_for_clean_workdir('clone1')
-
-    wait_for_directory('clone1/empty_dir')
-    wait_for_directory('clone2/empty_dir')
-    wait_for_directory('clone3/empty_dir')
-  end
-
-  it 'should mark unresolvable conflicts' do
-    write_file('clone1/file', 'testing')
-    wait_for_clean_workdir('clone1')
-
-    append_to_file('clone2/file', 'foobar')
-    append_to_file('clone3/file', 'deadbeef')
-    wait_for_clean_workdir('clone2')
-    wait_for_clean_workdir('clone3')
-
-    # HACK: Leaving in the sleep and standard checks.
-    # Trying to wait for the conflicts to be resolved does not seem to
-    # be working consistently when run on TravisCI. Hopefully this will.
-    sleep(6)
-    in_current_dir do
-      # Remember expected file counts include '.', '..', and '.git'
-      assert_includes(5..6, Dir.entries('clone1').count)
-      assert_includes(5..6, Dir.entries('clone2').count)
-      assert_includes(5..6, Dir.entries('clone3').count)
-    end
-    # TODO: Want to convert to these methods in the future
-    # wait_for_conflict_markers('clone1/file')
-    # wait_for_conflict_markers('clone2/file')
-    # wait_for_conflict_markers('clone3/file')
-  end
-end

data/test/integration/share_management_test.rb

@@ -1,95 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-require File.expand_path('../test_helper', __FILE__)
-
-describe 'Manage which shares are being watched' do
-  it 'should add a local repository' do
-    git_init_local
-    gitdocs_add
-    gitdocs_status
-    assert_gitdocs_status_contains(abs_current_dir('local'))
-  end
-
-  it 'should add a remote repository' do
-    git_init_remote
-    abs_remote_path = abs_current_dir('remote')
-    cmd = "gitdocs create local #{abs_remote_path} --pid=gitdocs.pid"
-    run_simple(cmd, true, 15)
-    assert_success(true)
-    assert_partial_output('Added path local to doc list', output_from(cmd))
-  end
-
-  it 'should update a share through the UI' do
-    git_init_local
-    gitdocs_add
-    start_daemon
-    visit('http://localhost:7777/')
-    click_link('Settings')
-
-    within('#settings') do
-      within('#share-0') do
-        fill_in('share[0][polling_interval]', with: '0.2')
-        select('Fetch only', from: 'share[0][sync_type]')
-      end
-      click_button('Save')
-    end
-
-    # Allow the asynchronous portion of the update finish before checking
-    # the result.
-    sleep(1)
-
-    click_link('Settings')
-    within('#settings') do
-      within('#share-0') do
-        page.must_have_field('share[0][polling_interval]', with: '0.2')
-        page.must_have_field('share[0][sync_type]', with: 'fetch')
-      end
-    end
-  end
-
-  describe 'remove a share' do
-    before do
-      git_init_local
-      gitdocs_add
-    end
-
-    it 'through CLI' do
-      cmd = 'gitdocs rm local --pid=gitdocs.pid'
-      run_simple(cmd, true, 15)
-      assert_success(true)
-      assert_partial_output('Removed path local from doc list', output_from(cmd))
-
-      gitdocs_status
-      assert_gitdocs_status_not_contain(abs_current_dir('local'))
-    end
-
-    it 'through UI' do
-      start_daemon
-      visit('http://localhost:7777/')
-      click_link('Settings')
-
-      within('#settings') do
-        within('#share-0') { click_link('Delete') }
-
-        page.must_have_css('.share', count: 0)
-      end
-    end
-  end
-
-  it 'should clear all existing shares' do
-    %w(local1 local2 local3).each do |path|
-      git_init_local(path)
-      gitdocs_add(path)
-    end
-
-    cmd = 'gitdocs clear --pid=gitdocs.pid'
-    run_simple(cmd, true, 15)
-    assert_success(true)
-    assert_partial_output('Cleared paths from gitdocs', output_from(cmd))
-
-    gitdocs_status
-    assert_gitdocs_status_not_contain(abs_current_dir('local1'))
-    assert_gitdocs_status_not_contain(abs_current_dir('local2'))
-    assert_gitdocs_status_not_contain(abs_current_dir('local3'))
-  end
-end

data/test/integration/status_test.rb

@@ -1,21 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-require File.expand_path('../test_helper', __FILE__)
-
-describe 'CLI with display daemon and share status' do
-  it 'should display information about the daemon' do
-    gitdocs_status
-    assert_gitdocs_status_contains(Gitdocs::VERSION)
-    assert_gitdocs_status_contains('Running: false')
-  end
-
-  it 'should display information about the shares' do
-    git_clone_and_gitdocs_add(git_init_remote, 'clone1', 'clone2', 'clone3')
-
-    gitdocs_status
-
-    assert_gitdocs_status_contains(abs_current_dir('clone1'))
-    assert_gitdocs_status_contains(abs_current_dir('clone2'))
-    assert_gitdocs_status_contains(abs_current_dir('clone3'))
-  end
-end

data/test/unit/runner_test.rb

@@ -1,122 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-require File.expand_path('../test_helper', __FILE__)
-
-describe 'gitdocs runner' 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 }
-
-    describe 'fetch sync' do
-      before do
-        share.stubs(:sync_type).returns('fetch')
-        repository.expects(:fetch).returns(fetch_result)
-      end
-
-      describe('fetch failure') { let(:fetch_result) { :not_ok } ; it { subject } }
-      describe('fetch success') { let(:fetch_result) { :ok }     ; it { subject } }
-    end
-
-    describe 'full sync' do
-      before do
-        share.stubs(:sync_type).returns('full')
-        repository.expects(:commit)
-        repository.expects(:fetch).returns(fetch_result)
-      end
-
-      describe 'fetch failure' do
-        let(:fetch_result) { :not_ok }
-        it { subject }
-      end
-
-      describe 'when merge error' do
-        let(:fetch_result) { :ok }
-        before do
-          repository.expects(:merge).returns('error')
-          notifier.expects(:merge_notification).with('error', 'root_path')
-        end
-        it { subject }
-      end
-
-      describe 'when merge not_ok' do
-        let(:fetch_result) { :ok }
-        before do
-          repository.expects(:merge).returns(:not_ok)
-          notifier.expects(:merge_notification).with(:not_ok, 'root_path')
-          repository.expects(:push).returns(push_result)
-        end
-
-        describe 'and push is not_ok' do
-          let(:push_result) { :not_ok }
-          before { notifier.expects(:push_notification).with(:not_ok, 'root_path') }
-          it { subject }
-        end
-
-        describe 'and push is ok' do
-          let(:push_result) { :ok }
-          before do
-            runner.instance_variable_set(:@last_synced_revision, :oid)
-            repository.stubs(:current_oid).returns(:next_oid)
-            changes = { 'Alice' => 1, 'Bob' => 2 }
-            repository.stubs(:author_count).with(:oid).returns(changes)
-            notifier.expects(:push_notification).with(changes, 'root_path')
-
-            subject
-          end
-          it { runner.instance_variable_get(:@last_synced_revision).must_equal :next_oid }
-        end
-      end
-
-      describe 'merge ok' do
-        let(:fetch_result) { :ok }
-
-        before do
-          repository.stubs(:current_oid).returns(:merge_oid, :push_oid)
-
-          repository.expects(:merge).returns(:ok)
-          runner.instance_variable_set(:@last_synced_revision, :oid)
-          changes = { 'Alice' => 1, 'Bob' => 3 }
-          repository.stubs(:author_count).with(:oid).returns(changes)
-          notifier.expects(:merge_notification).with(changes, 'root_path')
-          repository.expects(:push).returns(push_result)
-        end
-
-        describe 'and push is not_ok' do
-          let(:push_result) { :not_ok }
-          before do
-            notifier.expects(:push_notification).with(:not_ok, 'root_path')
-
-            subject
-          end
-          it { runner.instance_variable_get(:@last_synced_revision).must_equal :merge_oid }
-        end
-
-        describe 'and push is ok' do
-          let(:push_result) { :ok }
-          before do
-            changes = { 'Charlie' => 5, 'Dan' =>  7 }
-            repository.stubs(:author_count).with(:merge_oid).returns(changes)
-            notifier.expects(:push_notification).with(changes, 'root_path')
-
-            subject
-          end
-          it { runner.instance_variable_get(:@last_synced_revision).must_equal :push_oid }
-        end
-      end
-    end
-  end
-end