gitdocs 0.5.0 → 0.6.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDc4ZmI3MTc1YjRjZjE4ZmNmNDFmNjgwMDEzY2YzZTkwY2Q5MWI4Yw==
-  data.tar.gz: !binary |-
-    YmRjMzViNzc0MzgwMDVkMDgxOGNmMDI3MDZmYjhlMTU3OGUxMDg2ZQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MjMzNzJlNGY3YmMzMWY2YWY2ZTE1ZjBjYTJmZDYwMWZmM2NjMTYyOTM0YzUw
-    ODkwZmFmY2NkYmVkZTI3MjYxNmZhNjUwZDliYjJmODAzOGY2YTc3M2UwZjRk
-    MTZiNGYwNmVmMjU5ZDkyM2U1MjcwODdlZmQ1ODJhODJjZjA4ODQ=
-  data.tar.gz: !binary |-
-    MWM2Yjk4ZGE1ODIzMTg4YTEyYTg1YTNhZTc1MWI1NWFlMTczMWFlMjg5Y2Jh
-    NmRhYTAzYWNmMzI4MTZhNTdjN2QwMzA3MzZhMTI5ZDRmMGFhZWE3YTdhMWVk
-    ZTAwODA3OWZkMDdkMDEwZThlZDQyM2ZjZDMzMzA1ZjJiNDZhOTg=
+SHA1:
+  metadata.gz: 459edb301fffc2948f4ae59ed114492d628c4885
+  data.tar.gz: 619553936453338fc95f54ce9efad4a98383dba9
+SHA512:
+  metadata.gz: 879a1f9488c61a47713a9a645cfc76b4fff279baf6b443056a66650439866950b810b2196c252f54651cee2c0e5cdc28559d62460fb42a5e129660bcfa5dccde
+  data.tar.gz: 98681003763be98fcafd06bd95dfcfd6d08f2cc2ddc14b1d5842fd19a6d46eeaee4df6e55507c771845e842cdceb917caac32e1acd5f2c331de4751024b44112

data/.codeclimate.yml

@@ -0,0 +1,26 @@
+engines:
+  rubocop:
+    enabled: true
+  golint:
+    enabled: true
+  eslint:
+    enabled: true
+  csslint:
+    enabled: true
+  duplication:
+    enabled: true
+    config:
+      languages:
+        - ruby
+        - javascript
+ratings:
+  paths:
+    - app/**
+    - lib/**
+    - "**.rb"
+    - "**.go"
+exclude_paths:
+  - lib/gitdocs/public/js/ace/**/*
+  - "lib/gitdocs/public/js/bootstrap-alerts.js"
+  - "lib/gitdocs/public/js/jquery.js"
+  - "lib/gitdocs/public/js/jquery.tablesorter.js"

data/.rubocop.yml

@@ -1,8 +1,6 @@
 Documentation:
   Enabled: false
 
-ClassAndModuleChildren:
-  Enabled: false
 
 # Splitting method arguments across multiple lines can result in the containing
 # method looking long, but not actually increasing the complexity at all.
@@ -11,3 +9,11 @@ MethodLength:
 
 EachWithObject:
   Enabled: false
+
+LineLength:
+  Exclude:
+    - 'Rakefile'
+    - 'gitdocs.gemspec'
+
+SignalException:
+  EnforcedStyle: semantic

data/.travis.yml

@@ -2,7 +2,15 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.2.4
+  - 2.1.8
+  - 2.3.0
   - ruby-head
 matrix:
   allow_failures:
+    - rvm: 1.9.3
     - rvm: ruby-head
+sudo: false
+addons:
+  code_climate:
+    repo_token: "18995229639977d370a4adf13644223c53baa31b9c7fc302a7ce263aa5bc6dbf"

data/CHANGELOG

@@ -1,3 +1,16 @@
+0.6.0
+ * convert notification to use the Notiffany gem (@acant)
+ * upgrade rugged gem (@acant)
+ * fix missing dependency for the 'gitdocs open' command (@acant)
+ * convert to use Celluloid and the listen gem, and remove the old guard and
+   event-machine dependencies (@acant)
+
+0.6.0.pre1
+ * upgrade gems redcarpet, poltergeist (@acant)
+ * add 'rake debug' task for development and debugging (@acant)
+ * add a --verbose flag for starting gitdocs with more logging (@acant)
+ * change the -D flag to --foreground for running gitdocs in the foreground (acant)
+
 0.5.0 (May 2nd 2015)
  * upgrade gems activerecord, minitest, haml-lint, redcarpet (@acant)
  * convert web interface to use Sinatra instead of renee (@acant)

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 # Specify your gem's dependencies in gitdocs.gemspec
 gemspec

data/README.md

@@ -1,11 +1,11 @@
 # Gitdocs
 
-[![Gem Version](https://badge.fury.io/rb/gitdocs.png)](http://badge.fury.io/rb/gitdocs)
-[![Code Climate](https://codeclimate.com/github/bazaarlabs/gitdocs.png)](https://codeclimate.com/github/bazaarlabs/gitdocs)
+[![Gem Version](https://badge.fury.io/rb/gitdocs.svg)](http://badge.fury.io/rb/gitdocs)
+[![Code Climate](https://codeclimate.com/github/nesquena/gitdocs.svg)](https://codeclimate.com/github/nesquena/gitdocs)
 [![Build Status](https://travis-ci.org/nesquena/gitdocs.svg?branch=master)](https://travis-ci.org/nesquena/gitdocs)
-[![Inline docs](http://inch-ci.org/github/nesquena/gitdocs.png?branch=master)](http://inch-ci.org/github/nesquena/gitdocs)
+[![Inline docs](http://inch-ci.org/github/nesquena/gitdocs.svg?branch=master)](http://inch-ci.org/github/nesquena/gitdocs)
 [![Dependency Status](https://gemnasium.com/nesquena/gitdocs.svg)](https://gemnasium.com/nesquena/gitdocs)
-[![Coverage Status](https://coveralls.io/repos/nesquena/gitdocs/badge.png?branch=master)](https://coveralls.io/r/nesquena/gitdocs)
+[![Test Coverage](https://codeclimate.com/github/nesquena/gitdocs/badges/coverage.svg)](https://codeclimate.com/github/nesquena/gitdocs/coverage)
 
 Open-source dropbox alternative powered by git. Collaborate on files and tasks without any extra hassle.
 gitdocs will automatically keep everyone's repos in sync by pushing and pulling changes.
@@ -75,10 +75,10 @@ You need to start gitdocs in order for the monitoring to work:
 gitdocs start
 ```
 
-If the start command fails, you can check the logs in `~/.gitdocs/log` or run again with the debug flag:
+If the start command fails, you can check the logs in `~/.gitdocs/log` or run again in the foreground and increase logging to more easily see what is going wrong:
 
 ```
-gitdocs start -D
+gitdocs start --foreground --verbose
 ```
 
 Once gitdocs has been started and is monitoring the correct directories, simply start editing or adding files to your
@@ -207,5 +207,6 @@ but provide the features that makes Dropbox great. If you are interested in othe
   tool, not open source or publicly defined protocol
 * [StrongSync](https://secure.expandrive.com/strongsync) Dropbox clone utility,
   proprietary
+* [pullbox](https://github.com/prashanthellina/pullbox) Dropbox clone with git and Python
 
 If any other open-source dropbox alternatives are available, we would love to hear about them so let us know!

data/Rakefile

@@ -1,9 +1,15 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 require 'jslint/tasks'
+require 'haml_lint/rake_task'
+require 'rubocop/rake_task'
 
 JSLint.config_path = '.jslint.yml'
 
+HamlLint::RakeTask.new
+
+RuboCop::RakeTask.new
+
 namespace :test do
   # Separate the unit and integration tests when running the entire suite.
   Rake::TestTask.new(:unit) do |t|
@@ -12,11 +18,22 @@ namespace :test do
     t.verbose = true
   end
 
-  Rake::TestTask.new(integration: :unit) do |t|
-    t.libs.push('lib')
-    t.test_files = FileList[File.expand_path('../test/integration/**/*_test.rb', __FILE__)]
-    t.verbose = true
+  namespace :integration do
+    Rake::TestTask.new(cli: 'test:unit') do |t|
+      t.libs.push('lib')
+      t.test_files = FileList[File.expand_path('../test/integration/cli/**/*_test.rb', __FILE__)]
+      t.verbose = true
+    end
+
+    Rake::TestTask.new(web: :cli) do |t|
+      t.libs.push('lib')
+      t.test_files = FileList[File.expand_path('../test/integration/web/**/*_test.rb', __FILE__)]
+      t.verbose = true
+    end
   end
+
+  desc 'Run all integration tests'
+  task integration: 'integration:web'
 end
 
 # Keep a default test task for manually running any test
@@ -44,4 +61,13 @@ namespace :server do
   end
 end
 
-task default: 'test:integration'
+desc 'Run the daemon in debugging mode'
+task :debug do
+  exec('bin/gitdocs start --foreground --verbose --port 9999')
+end
+
+if ENV['TRAVIS']
+  task default: 'test:integration:cli'
+else
+  task default: 'test:integration'
+end

data/bin/gitdocs

@@ -2,4 +2,5 @@
 
 require 'gitdocs'
 
+Gitdocs::Initializer.initialize_all
 Gitdocs::Cli.start(ARGV)

data/config.ru

@@ -5,17 +5,19 @@ require './lib/gitdocs/browser_app'
 require './lib/gitdocs/repository'
 require './lib/gitdocs/configuration'
 
+# rubocop:disable AlignParameters
 use Rack::Static,
   urls: %w(/css /js /img /doc),
   root: './lib/gitdocs/public'
 use Rack::MethodOverride
 
-config_root = './tmp/web'
-FileUtils.mkdir_p(config_root)
-Gitdocs::SettingsApp.set :manager, Gitdocs::Manager.new(config_root, true)
+Gitdocs::Initializer.root_dirname = './tmp/web'
+Gitdocs::Initializer.initialize_database
+
 Gitdocs::SettingsApp.set :logging, true
 map('/settings') { run Gitdocs::SettingsApp }
 
-Gitdocs::BrowserApp.set :repositories, Gitdocs::Configuration.new(config_root).shares.map { |x| Gitdocs::Repository.new(x) }
+repositories = Gitdocs::Share.all.map { |x| Gitdocs::Repository.new(x) }
+Gitdocs::BrowserApp.set :repositories, repositories
 Gitdocs::BrowserApp.set :logging, true
 map('/') { run Gitdocs::BrowserApp }

data/gitdocs.gemspec

@@ -22,36 +22,39 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9'
 
-  s.add_dependency 'joshbuddy-guard', '~> 0.10.0'
-  s.add_dependency 'thin',            '~> 1.6.2'
+  # FIXME: celluloid v0.17 is not compatible with reel-rack/reel. It can only
+  # be upgraded once that is resolved.
+  s.add_dependency 'celluloid',       '~> 0.16.0'
+  s.add_dependency 'reel-rack',       '~> 0.2.2'
+  # FIXME: listen cannot be upgraded until we drop support for Ruby <v2.1
+  s.add_dependency 'listen',          '~> 3.0.5'
+
   s.add_dependency 'sinatra',         '~> 1.4.5'
-  s.add_dependency 'redcarpet',       '~> 3.2.2'
-  s.add_dependency 'thor',            '~> 0.14.6'
+  s.add_dependency 'redcarpet',       '~> 3.3.0'
+  s.add_dependency 'thor',            '~> 0.19.1'
   s.add_dependency 'coderay',         '~> 1.1.0'
-  s.add_dependency 'dante',           '~> 0.1.2'
+  s.add_dependency 'dante',           '~> 0.2.0'
   s.add_dependency 'growl',           '~> 1.0.3'
   s.add_dependency 'haml',            '~> 4.0.5'
   s.add_dependency 'sqlite3',         '~> 1.3.4'
   s.add_dependency 'activerecord',    '~> 4.2.0'
   s.add_dependency 'grit',            '~> 2.5.0'
-  s.add_dependency 'shell_tools',     '~> 0.1.0'
   s.add_dependency 'mimetype-fu',     '~> 0.1.2'
-  s.add_dependency 'eventmachine',    '>= 1.0.3'
   s.add_dependency 'launchy',         '~> 2.4.2'
-  s.add_dependency 'rugged',          '~> 0.19.0'
+  s.add_dependency 'rugged',          '~> 0.24.0'
   s.add_dependency 'table_print',     '~> 1.5.1'
+  s.add_dependency 'notiffany',       '~> 0.1.0'
 
-  s.add_development_dependency 'minitest',               '~> 5.5.0'
+  s.add_development_dependency 'minitest',               '~> 5.9.0'
   s.add_development_dependency 'capybara_minitest_spec', '~> 1.0.2'
-  s.add_development_dependency 'poltergeist',            '~> 1.5.1'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'mocha'
-  s.add_development_dependency 'fakeweb'
-  s.add_development_dependency 'metric_fu'
-  s.add_development_dependency 'aruba'
-  s.add_development_dependency 'rubocop'
-  s.add_development_dependency 'haml-lint',              '~> 0.10.0'
+  s.add_development_dependency 'shell_tools',            '~> 0.1.0'
+  s.add_development_dependency 'poltergeist',            '~> 1.7.0'
+  s.add_development_dependency 'rake',                   '~> 11.1.2'
+  s.add_development_dependency 'mocha',                  '~> 1.1.0'
+  s.add_development_dependency 'aruba',                  '~> 0.6.1'
+  s.add_development_dependency 'rubocop',                '~> 0.40.0'
+  s.add_development_dependency 'haml_lint',              '~> 0.17.1'
   s.add_development_dependency 'jslint_on_rails',        '~> 1.1.1'
-  s.add_development_dependency 'coveralls'
-  s.add_development_dependency 'shotgun'
+  s.add_development_dependency 'shotgun',                '~> 0.9.1'
+  s.add_development_dependency 'codeclimate-test-reporter'
 end

data/lib/gitdocs.rb

@@ -3,39 +3,77 @@
 require 'thread'
 require 'dante'
 require 'socket'
-require 'shell_tools'
-require 'guard'
 require 'grit'
 require 'rugged'
 require 'table_print'
+require 'notiffany'
+require 'launchy'
+require 'celluloid'
+require 'listen'
+require 'reel/rack'
 
 require 'gitdocs/version'
+require 'gitdocs/initializer'
+require 'gitdocs/share'
 require 'gitdocs/configuration'
-require 'gitdocs/runner'
-require 'gitdocs/server'
 require 'gitdocs/cli'
 require 'gitdocs/manager'
+require 'gitdocs/synchronizer'
 require 'gitdocs/notifier'
+require 'gitdocs/git_notifier'
 require 'gitdocs/repository'
 require 'gitdocs/repository/path'
+require 'gitdocs/repository/committer'
+require 'gitdocs/settings_app'
+require 'gitdocs/browser_app'
 require 'gitdocs/search'
 
 module Gitdocs
-  DEBUG = ENV['DEBUG']
-
-  # Gitdocs.start(:config_root => "...", :debug => true)
-  def self.start(options = {}, &blk)
-    options = { debug: DEBUG, config_root: nil }.merge(options)
-    @manager.stop if @manager
-    @manager = Manager.new(options[:config_root], options[:debug], &blk)
-    @manager.start(options[:port])
+  # @return [String]
+  def self.log_path
+    File.expand_path('log', Initializer.root_dirname)
   end
 
-  def self.restart
-    @manager.restart
+  # @param [String] message
+  # @return [void]
+  def self.log_debug(message)
+    init_log
+    Celluloid.logger.debug(message)
   end
 
-  def self.stop
-    @manager.stop
+  # @param [String] message
+  # @return [void]
+  def self.log_info(message)
+    init_log
+    Celluloid.logger.info(message)
+  end
+
+  # @param [String] message
+  # @return [void]
+  def self.log_warn(message)
+    init_log
+    Celluloid.logger.warn(message)
+  end
+
+  # @param [String] message
+  # @return [void]
+  def self.log_error(message)
+    init_log
+    Celluloid.logger.error(message)
+  end
+
+  ##############################################################################
+
+  private_class_method
+
+  # @return [void]
+  def self.init_log
+    return if @initialized
+
+    # Initialize the logger
+    log_output = Initializer.foreground ? STDOUT : log_path
+    Celluloid.logger = Logger.new(log_output)
+    Celluloid.logger.level = Initializer.verbose ? Logger::DEBUG : Logger::INFO
+    @initialized = true
   end
 end

data/lib/gitdocs/browser_app.rb

@@ -10,19 +10,33 @@ module Gitdocs
   class BrowserApp < Sinatra::Base
     set :haml, format: :html5
 
-    helpers Gitdocs::RenderingHelper
+    helpers RenderingHelper
+
+    helpers do
+      # @return [Integer]
+      def id
+        @id ||= params[:id].to_i
+      end
+
+      # @return [Gitdocs::Repository::Path]
+      def repository
+        @repository ||= Repository.new(Share.find(id))
+      end
+
+      # @return [Gitdocs::Repository::Path]
+      def path
+        halt(404) unless repository
+        @path ||= Repository::Path.new(
+          repository, URI.decode(params[:splat].first)
+        )
+      end
+    end
 
     get('/') do
-      if settings.repositories.size == 1
-        redirect to('/0/')
+      if Share.all.count == 1
+        redirect to("/#{Share.first.id}/")
       else
-        haml(
-          :home,
-          locals: {
-            shares:    settings.repositories,
-            nav_state: 'home'
-          }
-        )
+        haml(:home, locals: { nav_state: 'home' })
       end
     end
 
@@ -30,31 +44,15 @@ module Gitdocs
       haml(
         :search,
         locals: {
-          results: Gitdocs::Search.new(settings.repositories).search(params[:q]),
+          results:   Search.search(params[:q]),
           nav_state: nil
         }
       )
     end
 
-    helpers do
-      # @return [Integer]
-      def id
-        @id ||= params[:id].to_i
-      end
-
-      # @return [Gitdocs::Repository::Path]
-      def path
-        halt(404) unless settings.repositories[id]
-        @path ||= Gitdocs::Repository::Path.new(
-          settings.repositories[id], URI.unescape(params[:splat].first)
-        )
-      end
-    end
-
     get('/:id*') do
       default_locals = {
-        idx:       id,
-        root:      settings.repositories[id].root,
+        root:      repository.root,
         nav_state: nil
       }
 
@@ -105,7 +103,7 @@ module Gitdocs
       redirect_path =
         if params[:file] # upload
           path.join(params[:file][:filename])
-          FileUtils.mv(params[:file][:tempfile].path, path.absolute_path)
+          path.mv(params[:file][:tempfile].path)
           "/#{id}/#{path.relative_path}"
         elsif params[:filename] # add file/directory
           path.join(params[:filename])
@@ -125,26 +123,21 @@ module Gitdocs
     end
 
     put('/:id*') do
-      redirect_path =
+      commit_message =
         if params[:revision] # revert
           path.revert(params[:revision])
-          "/#{id}/#{path.relative_path}"
+          "Reverting '#{path.relative_path}' to #{params[:revision]}"
         elsif params[:data] && params[:message] # save
-          path.write(params[:data], params[:message])
-          "/#{id}/#{path.relative_path}"
-        else
-          # No valid inputs, do nothing and redirect.
-          "/#{id}/#{path.relative_path}"
+          path.write(params[:data])
+          params[:message]
         end
-      redirect to(redirect_path)
+      repository.write_commit_message(commit_message)
+      redirect to("/#{id}/#{path.relative_path}")
     end
 
     delete('/:id*') do
       path.remove
-      parent = File.dirname(path.relative_path)
-      parent = '' if parent == '/'
-      parent = nil if parent == '.'
-      redirect to("/#{id}#{parent}")
+      redirect to("/#{id}/#{path.relative_dirname}")
     end
   end
 end