Cleaning up some warnings

acant · Apr 14, 2017 · 78b2c88 · 78b2c88
1 parent 0d33861
commit 78b2c88
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/lib/gitdocs.rb b/lib/gitdocs.rb
@@ -65,8 +65,6 @@ def self.log_error(message)
 
   ##############################################################################
 
-  private_class_method
-
   # @return [void]
   def self.init_log
     return if @initialized
@@ -77,4 +75,5 @@ def self.init_log
     Celluloid.logger.level = Initializer.verbose ? Logger::DEBUG : Logger::INFO
     @initialized = true
   end
+  private_class_method :init_log
 end
diff --git a/lib/gitdocs/browser_app.rb b/lib/gitdocs/browser_app.rb
@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 require 'sinatra/base'
-require 'uri'
+require 'cgi'
 require 'haml'
 require 'mimetype_fu'
 require 'gitdocs/rendering_helper'
@@ -27,7 +27,7 @@ def repository
       def path
         halt(404) unless repository
         @path ||= Repository::Path.new(
-          repository, URI.decode(params[:splat].first)
+          repository, CGI.unescape(params[:splat].first)
         )
       end
     end

diff --git a/lib/gitdocs/cli.rb b/lib/gitdocs/cli.rb
@@ -67,7 +67,7 @@ def restart
     method_option :pid,          type: :string,  aliases: '-P'
     method_option :interval,     type: :numeric, aliases: '-i', default: 15
     method_option :notification, type: :boolean, aliases: '-n', default: true
-    method_option :sync,         type: :boolean, aliases: '-s', default: 'full'
+    method_option :sync,         type: :string,  aliases: '-s', default: 'full', enum: %w(full fetch)
     def add(path)
       Share.create_by_path!(
         normalize_path(path),
@@ -83,7 +83,7 @@ def add(path)
     method_option :pid,          type: :string,  aliases: '-P'
     method_option :interval,     type: :numeric, aliases: '-i', default: 15
     method_option :notification, type: :boolean, aliases: '-n', default: true
-    method_option :sync,         type: :boolean, aliases: '-s', default: 'full'
+    method_option :sync,         type: :string,  aliases: '-s', default: 'full', enum: %w(full fetch)
     def create(path, remote)
       Repository.clone(path, remote)
       Share.create_by_path!(

diff --git a/test/unit/notifier_test.rb b/test/unit/notifier_test.rb
@@ -84,7 +84,10 @@
       subject { notifier.disconnect }
 
       describe 'not connected' do
-        before { subject }
+        before do
+          notifier.instance_variable_set(:@notifier, nil)
+          subject
+        end
         it { notifier.instance_variable_get(:@notifier).must_equal(nil) }
       end