double_doc 1.3.0 → 2.0.0

data/lib/double_doc/import_handler.rb

@@ -1,5 +1,6 @@
 require 'pathname'
 require 'double_doc/doc_extractor'
+require 'bundler'
 
 module DoubleDoc
   class ImportHandler
@@ -10,13 +11,12 @@ module DoubleDoc
       @load_paths = [@root]
 
       if options[:gemfile]
-        gemfile = @root + "Gemfile"
-
-        unless gemfile.exist?
-          raise LoadError, "missing Gemfile inside #{@root}"
+        begin
+          @load_paths.concat(load_paths_from_gemfile(Bundler.root))
+        rescue => e
+          puts "Could not load paths from Gemfile; please make sure you've run bundle install with the correct gemset."
+          raise e
         end
-
-        @load_paths.concat(load_paths_from_gemfile(gemfile))
       end
 
       @docs = {}
@@ -37,11 +37,17 @@ module DoubleDoc
 
     protected
 
-    def load_paths_from_gemfile(gemfile)
+    def load_paths_from_gemfile(root)
+      gemfile = root + "Gemfile"
+
+      unless gemfile.exist?
+        raise LoadError, "missing Gemfile inside #{root}"
+      end
+
       with_gemfile(gemfile) do
         puts "Loading paths from #{gemfile}"
 
-        defn = Bundler::Definition.build(gemfile, @root + "Gemfile.lock", nil)
+        defn = Bundler::Definition.build(gemfile, root + "Gemfile.lock", nil)
         defn.validate_ruby!
         defn.resolve_with_cache!
 

data/lib/double_doc/version.rb

@@ -1,4 +1,4 @@
-## ## DoubleDoc 1.3
+## ## DoubleDoc 2.0
 module DoubleDoc
-  VERSION = "1.3.0"
+  VERSION = "2.0.0"
 end

data/test/import_handler_test.rb

@@ -13,16 +13,6 @@ describe "import handler" do
     let(:root) { Bundler.root }
     let(:options) {{ :gemfile => true }}
 
-    describe "when root has no tmpfile" do
-      let(:root) { Bundler.root + "lib" }
-
-      describe "initialization" do
-        it "should raise" do
-          lambda { subject }.must_raise LoadError
-        end
-      end
-    end
-
     describe "rubygems" do
       describe "load_paths" do
         it "should add Gemfile load paths" do
@@ -44,17 +34,13 @@ describe "import handler" do
       end
     end
 
-    describe "path, git" do
-      let(:root) { File.join(File.expand_path(File.dirname(__FILE__)), "fixtures") }
-
-      describe "find_file" do
-        it "should resolve files from path" do
-          subject.send(:find_file, "double_doc.rb").must_be_instance_of File
-        end
+    describe "find_file" do
+      it "should resolve files from path" do
+        subject.send(:find_file, "double_doc.rb").must_be_instance_of File
+      end
 
-        it "should resolve file from git" do
-          subject.send(:find_file, "mime-types.rb").must_be_instance_of File
-        end
+      it "should resolve file from git" do
+        subject.send(:find_file, "mime-types.rb").must_be_instance_of File
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: double_doc
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -128,14 +128,6 @@ files:
 - templates/screen.css
 - readme.md
 - test/doc_extractor_test.rb
-- test/fixtures/Gemfile
-- test/fixtures/Gemfile.lock
-- test/fixtures/vendor/cache/erubis-2.7.0.gem
-- test/fixtures/vendor/cache/posix-spawn-0.3.6.gem
-- test/fixtures/vendor/cache/pygments.rb-0.5.0.gem
-- test/fixtures/vendor/cache/rake-10.0.4.gem
-- test/fixtures/vendor/cache/redcarpet-2.2.2.gem
-- test/fixtures/vendor/cache/yajl-ruby-1.1.0.gem
 - test/html_generator_test.rb
 - test/import_handler_test.rb
 - test/test_helper.rb
@@ -153,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1537526380922081734
+      hash: -1964755725115919551
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -162,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1537526380922081734
+      hash: -1964755725115919551
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -171,14 +163,6 @@ specification_version: 3
 summary: Documentation right where you want it
 test_files:
 - test/doc_extractor_test.rb
-- test/fixtures/Gemfile
-- test/fixtures/Gemfile.lock
-- test/fixtures/vendor/cache/erubis-2.7.0.gem
-- test/fixtures/vendor/cache/posix-spawn-0.3.6.gem
-- test/fixtures/vendor/cache/pygments.rb-0.5.0.gem
-- test/fixtures/vendor/cache/rake-10.0.4.gem
-- test/fixtures/vendor/cache/redcarpet-2.2.2.gem
-- test/fixtures/vendor/cache/yajl-ruby-1.1.0.gem
 - test/html_generator_test.rb
 - test/import_handler_test.rb
 - test/test_helper.rb

data/test/fixtures/Gemfile

@@ -1,4 +0,0 @@
-source "https://rubygems.org"
-
-gem "double_doc", :path => File.join(File.expand_path(File.dirname(__FILE__)), "..", "..")
-gem "mime-types", :git => "https://github.com/halostatue/mime-types.git", :ref => "v1.22"

data/test/fixtures/Gemfile.lock

@@ -1,34 +0,0 @@
-GIT
-  remote: https://github.com/halostatue/mime-types.git
-  revision: b8d2208cc34e9b9ca6456182742dcb3bfc47daf6
-  ref: v1.22
-  specs:
-    mime-types (1.20.1)
-
-PATH
-  remote: /Users/staugaard/code/double_doc
-  specs:
-    double_doc (1.3.0)
-      erubis
-      pygments.rb (~> 0.2)
-      rake
-      redcarpet (~> 2.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    erubis (2.7.0)
-    posix-spawn (0.3.6)
-    pygments.rb (0.5.0)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
-    rake (10.0.4)
-    redcarpet (2.2.2)
-    yajl-ruby (1.1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  double_doc!
-  mime-types!