gitdocs 0.3.3 → 0.3.4

data/gitdocs.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'redcarpet'
   s.add_dependency 'thor'
   s.add_dependency 'coderay'
-  s.add_dependency 'dante', '~> 0.0.4'
+  s.add_dependency 'dante', '~> 0.1.2'
   s.add_dependency 'growl', '~> 1.0.3'
   s.add_dependency 'yajl-ruby'
   s.add_dependency 'haml'

data/lib/gitdocs/cli.rb

@@ -9,12 +9,11 @@ module Gitdocs
     desc "start", "Starts a daemonized gitdocs process"
     method_option :debug, :type => :boolean, :aliases => "-D"
     def start
-      if !self.running? && !options[:debug]
-        self.runner(:daemonize => true, :pid_path => self.pid_path).execute { Gitdocs.run }
-        until_true(5) { self.running? }
+      if self.stopped? && !options[:debug]
+        self.runner.execute { Gitdocs.run }
         self.running? ? say("Started gitdocs", :green) : say("Failed to start gitdocs", :red)
-      elsif !self.running? && options[:debug]
-        say "Running in debug mode", :yellow
+      elsif self.stopped? && options[:debug]
+        say "Starting in debug mode", :yellow
         Gitdocs.run(nil, true)
       else # already running
         say "Gitdocs is already running, please use restart", :red
@@ -24,7 +23,7 @@ module Gitdocs
     desc "stop", "Stops the gitdocs process"
     def stop
       if self.running?
-        self.runner(:kill => true, :pid_path => self.pid_path).execute
+        self.runner.execute(:kill => true)
         say "Stopped gitdocs", :red
       else # not running
         say "Gitdocs is not running", :red
@@ -34,7 +33,6 @@ module Gitdocs
     desc "restart", "Restarts the gitdocs process"
     def restart
       self.stop
-      until_true(5) { self.running? }
       self.start
     end
 
@@ -54,7 +52,7 @@ module Gitdocs
 
     desc "clear", "Clears all paths from gitdocs"
     def clear
-      self.config.paths = []
+      self.config.clear
       say "Cleared paths from gitdocs"
     end
 
@@ -88,7 +86,7 @@ module Gitdocs
     # Helpers for thor
     no_tasks do
       def runner(options={})
-        Dante::Runner.new('gitdocs', options)
+        Dante::Runner.new('gitdocs', options.merge(:debug => false, :daemonize => true, :pid_path => self.pid_path))
       end
 
       def config
@@ -96,26 +94,15 @@ module Gitdocs
       end
 
       def running?
-        return false unless File.exist?(pid_path)
-        Process.kill 0, File.read(pid_path).to_i
-        true
-      rescue Errno::ESRCH
-        false
+        self.runner.daemon_running?
       end
 
-      def pid_path
-        "/tmp/gitdocs.pid"
+      def stopped?
+        self.runner.daemon_stopped?
       end
 
-      # Runs until the block condition is met or the retry_count is exceeded
-      # until_true(10) { ...return_condition... }
-      def until_true(retry_count, &block)
-        count = 0
-        while count < retry_count && block.call != true
-          count += 1
-          sleep(1)
-        end
-        count < retry_count
+      def pid_path
+        "/tmp/gitdocs.pid"
       end
     end
 

data/lib/gitdocs/configuration.rb

@@ -50,6 +50,10 @@ module Gitdocs
       Share.where(:path => path).destroy_all
     end
 
+    def clear
+      Share.destroy_all
+    end
+
     def shares
       Share.all
     end

data/lib/gitdocs/version.rb

@@ -1,3 +1,3 @@
 module Gitdocs
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/test/configuration_test.rb

@@ -26,6 +26,13 @@ describe "gitdocs configuration" do
     assert_equal ["/my/path"], @config.shares.map(&:path)
   end
 
+  it "can clear paths" do
+    @config.add_path('/my/path')
+    @config.add_path('/my/path/2')
+    @config.clear
+    assert_equal [], @config.shares.map(&:path)
+  end
+
   it "can normalize paths" do
     assert_equal File.expand_path("../test_helper.rb", Dir.pwd), @config.normalize_path("../test_helper.rb")
   end

metadata

@@ -2,7 +2,7 @@
 name: gitdocs
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Josh Hull
@@ -88,7 +88,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.0.4
+        version: 0.1.2
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency