gitdocs 0.2.0 → 0.3.0

data/lib/gitdocs/views/settings.haml

@@ -0,0 +1,34 @@
+%h1 Settings
+
+%h2 Shares
+
+%form{:method => 'POST', :action => '/settings'}
+  -conf.shares.each_with_index do |share, idx|
+    %div{:id => "share-#{idx}", :class => "share #{idx % 2 == 0 ? 'even' : 'odd'}"}
+      %dl
+        %dt Path
+        %dd
+          %input{:name=>"share[#{idx}][path]", :value => share.path}
+      %dl
+        %dt Polling interval
+        %dd
+          %input{:name=>"share[#{idx}][polling_interval]", :value => share.polling_interval}
+      %dl
+        %dt Remote
+        %dd
+          %input{:name=>"share[#{idx}][remote_name]", :value => share.remote_name}
+      %dl
+        %dt Branch
+        %dd
+          %input{:name=>"share[#{idx}][branch_name]", :value => share.branch_name}
+      %dl
+        %dt Notifications?
+        %dd
+          %input{:type =>'hidden', :value => '0', :name=>"share[#{idx}][notification]"}
+          %input{:type =>'checkbox', :value => '1', :name=>"share[#{idx}][notification]", :checked => share.notification ? 'checked' : nil}
+      %dl.delete
+        %dt Delete
+        %dd
+          %input{:type =>'button', :value => "Delete"}
+          %input{:type =>'hidden', :name=>"share[#{idx}][delete]"}
+  %input{:value => 'Save', :type => 'submit'}

data/lib/gitdocs.rb

@@ -9,7 +9,6 @@ require 'growl'
 require 'yajl'
 require 'dante'
 
-
 module Gitdocs
 
   DEBUG = ENV['DEBUG']
@@ -17,14 +16,15 @@ module Gitdocs
   def self.run(config_root = nil, debug = DEBUG)
     loop do
       config = Configuration.new(config_root)
+      yield config if block_given?
       puts "Gitdocs v#{VERSION}" if debug
       puts "Using configuration root: '#{config.config_root}'" if debug
-      puts "Watch paths: #{config.paths.join(", ")}" if debug
+      puts "Shares: #{config.shares.map(&:inspect).join(", ")}" if debug
       # Start the repo watchers
       runners = []
-      threads = config.paths.map do |path|
+      threads = config.shares.map do |share|
         t = Thread.new(runners) { |r|
-          runner = Runner.new(path)
+          runner = Runner.new(share)
           r << runner
           runner.run
         }
@@ -34,7 +34,7 @@ module Gitdocs
       sleep 1
       unless defined?(pid) && pid
         # Start the web front-end
-        pid = fork { Server.new(*runners).start }
+        pid = fork { Server.new(config, *runners).start }
         at_exit { Process.kill("KILL", pid) rescue nil }
       end
       puts "Watch threads: #{threads.map { |t| "Thread status: '#{t.status}', running: #{t.alive?}" }}" if debug

data/test/configuration_test.rb

@@ -2,28 +2,28 @@ require File.expand_path('../test_helper', __FILE__)
 
 describe "gitdocs configuration" do
   before do
-    @config = Gitdocs::Configuration.new("/tmp/gitdocs")
-    @config.paths = [] # Reset paths
+    capture_out { @config = Gitdocs::Configuration.new("/tmp/gitdocs") }
   end
 
   it "has sensible default config root" do
     assert_equal "/tmp/gitdocs", @config.config_root
   end
 
-  it "can retrieve empty paths" do
-    assert_equal [], @config.paths
+  it "can retrieve empty shares" do
+    assert_equal [], @config.shares
   end
 
   it "can have a path added" do
     @config.add_path('/my/path')
-    assert_equal "/my/path", @config.paths.first
+    assert_equal "/my/path", @config.shares.first.path
+    assert_equal 15.0, @config.shares.first.polling_interval
   end
 
   it "can have a path removed" do
     @config.add_path('/my/path')
     @config.add_path('/my/path/2')
     @config.remove_path('/my/path/2')
-    assert_equal ["/my/path"], @config.paths
+    assert_equal ["/my/path"], @config.shares.map(&:path)
   end
 
   it "can normalize paths" do

data/test/test_helper.rb

@@ -43,24 +43,31 @@ class MiniTest::Spec
     capture_out { `git init /tmp/gitdocs/master --bare` }
     sub_paths = count.times.map do |c|
       capture_out { `cd /tmp/gitdocs && git clone file://#{master_path} #{c}` }
-      "/tmp/gitdocs/#{c}"
+      conf_path = "/tmp/gitdocs/config/#{c}"
+      FileUtils.mkdir_p(conf_path)
+      ["/tmp/gitdocs/#{c}", conf_path]
     end
-    pids = sub_paths.map { |path| fork do
+    pids = sub_paths.map do |(path, conf_path)|
+      fork do
       unless ENV['DEBUG']
         STDOUT.reopen(File.open("/dev/null", 'w'))
         STDERR.reopen(File.open("/dev/null", 'w'))
       end
       begin
-        Gitdocs::Runner.new(path, :growl => false, :polling_interval => 0.5).run
+        puts "RUNNING!"
+        Gitdocs.run(conf_path) do |conf|
+          conf.add_path(path, :polling_interval => 0.1, :notification => false)
+        end
       rescue
         puts "RATHER BAD ~~~~~"
         puts $!.message
         puts $!.backtrace.join("\n  ")
+        end
       end
-    end }
+    end
     begin
-      sleep 0.1
-      yield sub_paths
+      sleep 1
+      yield sub_paths.map{|sp| sp.first}
     ensure
       pids.each { |pid| Process.kill("INT", pid) rescue nil }
     end

metadata

@@ -1,173 +1,202 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gitdocs
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Josh Hull
 - Nathan Esquenazi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-02 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-05 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rb-fsevent
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70265086574980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.4.3.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: thin
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70265086574980
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: &70265086574080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: renee
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70265086574080
+- !ruby/object:Gem::Dependency
+  name: renee
+  requirement: &70265086572080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.3.6
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: redcarpet
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70265086572080
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: &70265086571200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70265086571200
+- !ruby/object:Gem::Dependency
   name: thor
+  requirement: &70265086570280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70265086570280
+- !ruby/object:Gem::Dependency
+  name: coderay
+  requirement: &70265086568440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: dante
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70265086568440
+- !ruby/object:Gem::Dependency
+  name: dante
+  requirement: &70265086567200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: growl
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70265086567200
+- !ruby/object:Gem::Dependency
+  name: growl
+  requirement: &70265086565200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.3
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70265086565200
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &70265086564420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70265086564420
+- !ruby/object:Gem::Dependency
   name: haml
+  requirement: &70265086563360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70265086563360
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70265086562040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *70265086562040
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70265086560080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70265086560080
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70265086558540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.6.1
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70265086558540
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70265086557020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *70265086557020
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70265086554480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *70265086554480
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &70265086552960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id013
+  prerelease: false
+  version_requirements: *70265086552960
 description: Open-source Dropbox using Ruby and Git.
-email: 
+email:
 - joshbuddy@gmail.com
 - nesquena@gmail.com
-executables: 
+executables:
 - gitdocs
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -178,48 +207,90 @@ files:
 - lib/gitdocs.rb
 - lib/gitdocs/cli.rb
 - lib/gitdocs/configuration.rb
+- lib/gitdocs/migration/001_create_shares.rb
+- lib/gitdocs/migration/002_add_remote_branch.rb
 - lib/gitdocs/public/css/app.css
+- lib/gitdocs/public/css/coderay.css
 - lib/gitdocs/public/css/reset.css
+- lib/gitdocs/public/css/tilt.css
+- lib/gitdocs/public/img/git_logo.png
+- lib/gitdocs/public/js/ace/ace-compat.js
+- lib/gitdocs/public/js/ace/ace-uncompressed.js
+- lib/gitdocs/public/js/ace/ace.js
+- lib/gitdocs/public/js/ace/keybinding-emacs.js
+- lib/gitdocs/public/js/ace/keybinding-vim.js
+- lib/gitdocs/public/js/ace/mode-coffee.js
+- lib/gitdocs/public/js/ace/mode-css.js
+- lib/gitdocs/public/js/ace/mode-html.js
+- lib/gitdocs/public/js/ace/mode-javascript.js
+- lib/gitdocs/public/js/ace/mode-json.js
+- lib/gitdocs/public/js/ace/mode-lua.js
+- lib/gitdocs/public/js/ace/mode-markdown.js
+- lib/gitdocs/public/js/ace/mode-php.js
+- lib/gitdocs/public/js/ace/mode-python.js
+- lib/gitdocs/public/js/ace/mode-ruby.js
+- lib/gitdocs/public/js/ace/mode-scala.js
+- lib/gitdocs/public/js/ace/mode-scss.js
+- lib/gitdocs/public/js/ace/mode-sql.js
+- lib/gitdocs/public/js/ace/mode-svg.js
+- lib/gitdocs/public/js/ace/mode-textile.js
+- lib/gitdocs/public/js/ace/mode-xml.js
+- lib/gitdocs/public/js/ace/theme-tomorrow.js
+- lib/gitdocs/public/js/ace/theme-tomorrow_night.js
+- lib/gitdocs/public/js/ace/theme-tomorrow_night_blue.js
+- lib/gitdocs/public/js/ace/theme-twilight.js
+- lib/gitdocs/public/js/ace/theme-vibrant_ink.js
+- lib/gitdocs/public/js/ace/worker-coffee.js
+- lib/gitdocs/public/js/ace/worker-css.js
+- lib/gitdocs/public/js/ace/worker-javascript.js
+- lib/gitdocs/public/js/app.js
+- lib/gitdocs/public/js/edit.js
+- lib/gitdocs/public/js/jquery.js
+- lib/gitdocs/public/js/util.js
 - lib/gitdocs/runner.rb
 - lib/gitdocs/server.rb
 - lib/gitdocs/version.rb
 - lib/gitdocs/views/app.haml
 - lib/gitdocs/views/dir.haml
+- lib/gitdocs/views/edit.haml
 - lib/gitdocs/views/file.haml
 - lib/gitdocs/views/home.haml
+- lib/gitdocs/views/settings.haml
 - lib/img/icon.png
 - test/configuration_test.rb
 - test/runner_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://engineering.gomiso.com/2011/11/30/collaborate-and-track-tasks-with-ease-using-gitdocs/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -859134024134666501
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -859134024134666501
 requirements: []
-
 rubyforge_project: gitdocs
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Open-source Dropbox using Ruby and Git
-test_files: 
+test_files:
 - test/configuration_test.rb
 - test/runner_test.rb
 - test/test_helper.rb