Fix GithubCheckoutJob (with test)

Author: lsegal

app/jobs/github_checkout_job.rb

@@ -20,6 +20,7 @@ def commit=(value)
   end
 
   def perform(owner:, project:, commit: nil)
+    commit = nil if commit.blank?
     self.owner = owner
     self.project = project
     self.commit = commit.present? ? commit : primary_branch
@@ -41,7 +42,7 @@ def url
   end
 
   def run_checkout
-    if commit && repository_path.directory?
+    if commit.present? && repository_path.directory?
       run_checkout_pull
     else
       run_checkout_clone
@@ -79,15 +80,15 @@ def run_checkout_clone
   end
 
   def temp_clone_path
-    @temp_clone_path ||= Rails.root.join("storage", "github_clones", "#{project}-#{owner}-#{Time.now.to_f}")
+    @temp_clone_path ||= Rubydoc.storage_path.join("github_clones", "#{project}-#{owner}-#{Time.now.to_f}")
   end
 
   def repository_path
     @repository_path ||= GithubLibrary.base_path.join(project, owner, commit)
   end
 
   def library_version
-    @library_version ||= YARD::Server::LibraryVersion.new(name, commit, nil, :github)
+    YARD::Server::LibraryVersion.new(name, commit, nil, :github)
   end
 
   def flush_cache

app/jobs/update_remote_gems_list_job.rb

@@ -11,7 +11,7 @@ def self.locked?
   end
 
   def self.lock_file
-    @lock_file ||= Rails.root.join("storage", "update_gems.lock")
+    @lock_file ||= Rubydoc.storage_path.join("update_gems.lock")
   end
 
   def perform

app/models/concerns/featured_library.rb

@@ -17,7 +17,7 @@ def yardoc_file_for_featured
   end
 
   def self.base_path
-    @base_path ||= Rails.root.join("storage", "repos", "featured")
+    @base_path ||= Rubydoc.storage_path.join("repos", "featured")
   end
 
   def self.versions_for(name)

app/models/concerns/gem_library.rb

@@ -17,7 +17,7 @@ def yardoc_file_for_remote_gem
   end
 
   def self.base_path
-    @base_path ||= Rails.root.join("storage", "repos", "gems")
+    @base_path ||= Rubydoc.storage_path.join("repos", "gems")
   end
 
   def disallowed_list

app/models/concerns/github_library.rb

@@ -17,7 +17,7 @@ def yardoc_file_for_github
   end
 
   def self.base_path
-    @base_path ||= Rails.root.join("storage", "repos", "github")
+    @base_path ||= Rubydoc.storage_path.join("repos", "github")
   end
 
   def disallowed_list

app/models/concerns/stdlib_library.rb

@@ -17,6 +17,6 @@ def yardoc_file_for_stdlib
   end
 
   def self.base_path
-    @base_path ||= Rails.root.join("storage", "repos", "stdlib")
+    @base_path ||= Rubydoc.storage_path.join("repos", "stdlib")
   end
 end

app/models/stdlib_installer.rb

@@ -10,7 +10,7 @@ def initialize(version)
   end
 
   def ruby_root
-    @ruby_root ||= Rails.root.join("storage", "ruby")
+    @ruby_root ||= Rubydoc.storage_path.join("ruby")
   end
 
   def setup_ruby_clone

config/initializers/rubydoc.rb

@@ -37,6 +37,10 @@ def self.config=(config)
       Rubydoc.config = {}
     end
   end
+
+  def self.storage_path
+    Rails.env.test? ? Rails.root.join("tmp", "storage", "test") : Rails.root.join("storage")
+  end
 end
 
 # Serializers

spec/rails_helper.rb

@@ -77,3 +77,7 @@
 
   config.include FactoryBot::Syntax::Methods
 end
+
+# Reset storage
+Rubydoc.storage_path.rmtree if Rubydoc.storage_path.directory?
+Rubydoc.storage_path.mkpath