roger 0.13.0 → 1.0.0

data/test/unit/cli/cli_test_test.rb

@@ -1,6 +1,7 @@
 require "./lib/roger/cli.rb"
 require "test/unit"
-require "stringio"
+
+require File.dirname(__FILE__) + "/../../helpers/cli"
 
 require File.dirname(__FILE__) + "/../../project/lib/tests/fail/fail"
 require File.dirname(__FILE__) + "/../../project/lib/tests/succeed/succeed"
@@ -10,47 +11,23 @@ require File.dirname(__FILE__) + "/../../project/lib/tests/noop/noop"
 
 module Roger
   class CliTestTest < ::Test::Unit::TestCase
+    include TestCli
 
-    def setup
-      @base_path = File.dirname(__FILE__) + "/../../project"
-    end
-
-
-    # Capture stdout/stderr output
-    def capture
-      @_orig_stdout, @_orig_stderr = $stdout, $stderr
-      
-      $stdout = StringIO.new
-      $stderr = StringIO.new
-
-      yield
-
-      return [$stdout.string, $stderr.string]
-    ensure
-      $stdout, $stderr = @_orig_stdout, @_orig_stderr
+    def teardown
+      Cli::Base.project = nil
     end
 
     def run_test_command(args, &block)
-      project = Project.new(@base_path, :mockupfile_path => false)
-
-      mockupfile = Roger::Mockupfile.new(project)
-
-      if block_given?
-        mockupfile.test(&block)
-      else
-        mockupfile.test do |t|
-          t.use :succeed
-          t.use :noop
+      run_command_with_mockupfile(args) do |mockupfile|
+        if block_given?
+          mockupfile.test(&block)
+        else
+          mockupfile.test do |t|
+            t.use :succeed
+            t.use :noop
+          end
         end
       end
-
-      project.mockupfile = mockupfile
-
-      Cli::Base.project = project
-
-      capture do
-        Cli::Base.start(args, :debug => true)
-      end
     end
 
     def test_has_subcommand_all
@@ -69,15 +46,15 @@ module Roger
         t.use :succeed
         t.use :noop
       end
-      assert out.index("RogerNoopTest::Test") > out.index("RogerSucceedTest::Test") 
-    end    
+      assert out.index("RogerNoopTest::Test") > out.index("RogerSucceedTest::Test")
+    end
 
     def test_subcommand_all_runs_all_tests_in_order_2
       out, err = run_test_command %w{test all} do |t|
         t.use :noop
-        t.use :succeed        
+        t.use :succeed
       end
-      assert out.index("RogerSucceedTest::Test") > out.index("RogerNoopTest::Test") 
+      assert out.index("RogerSucceedTest::Test") > out.index("RogerNoopTest::Test")
     end
 
     # roger test
@@ -87,6 +64,22 @@ module Roger
       assert_includes out, "RogerSucceedTest::Test"
     end
 
+    # roger test -v
+    def test_has_option_v
+      # A somewhat a-typical test,
+      # just to make it work
+      cli = ::Roger::Cli::Base.new [], %w{--verbose}
+      cli.class.project.mockupfile.test do |t|
+        t.use :noop
+      end
+
+      out, _err = capture do
+        cli.invoke "test"
+      end
+
+      assert_includes out, "NOOP DEBUG", out
+    end
+
     # roger help test
     def test_help_shows_available_subcommands
       out, err = run_test_command %w{help test}
@@ -97,7 +90,7 @@ module Roger
 
     # roger test noop
     def test_subcommand_x_runs_only_test_x
-      out, err = run_test_command %w{test noop}      
+      out, err = run_test_command %w{test noop}
       assert_includes out, "RogerNoopTest::Test"
       assert_not_includes out, "RogerSucceedTest::Test"
     end
@@ -117,7 +110,7 @@ module Roger
           t.use :noop
           t.use :fail
         end
-      end      
+      end
     end
 
     def test_subcommand_all_has_exit_code_1_on_failure
@@ -135,7 +128,7 @@ module Roger
           t.use :noop
           t.use :succeed
         end
-      end         
+      end
     end
 
   end

data/test/unit/generators_test.rb

@@ -24,7 +24,7 @@ module CustomGens
         # Somewhat ugly way of checking
         raise StandardError if @project
       end
-    end    
+    end
 
   end
 end
@@ -33,6 +33,10 @@ module Roger
   class GeneratorTest < ::Test::Unit::TestCase
     def setup
       @cli = Cli::Base.new
+
+      # Dirty hack to clean up tasks
+      Cli::Generate.tasks.delete("mocked")
+      Cli::Generate.tasks.delete("mockery")
     end
 
     def test_working_project
@@ -51,6 +55,15 @@ module Roger
       assert_equal Cli::Generate.tasks["mocked"].usage, "mocked PATH ANOTHER_ARG"
     end
 
+    def test_register_generator_with_custom_name
+      Roger::Generators.register :mockery, CustomGens::Generators::MockedGenerator
+      assert_includes Cli::Generate.tasks, "mockery"
+    end
+
+    def test_cli_help_shows_all_available_generators
+
+    end
+
     def test_default_generator
       assert_includes Cli::Generate.tasks, "new"
     end
@@ -65,7 +78,7 @@ module Roger
 
     def test_invoke_mocked_generator
       Roger::Generators.register CustomGens::Generators::MockedGenerator
-      
+
       generators = Cli::Generate.new
       assert_raise NotImplementedError do
         generators.invoke :mocked

data/test/unit/test_test.rb

@@ -0,0 +1,25 @@
+# encoding: UTF-8
+require "test/unit"
+require "mocha/test_unit"
+require "./lib/roger/test.rb"
+
+module Roger
+  class TestTest < ::Test::Unit::TestCase
+    def setup
+      @files = ["html/javascripts/site.js",
+                "html/vendor/underscore/underscore.js"]
+      @globs = stub(map: @files)
+    end
+
+    def test_get_files
+      test = Roger::Test.new({})
+      assert_equal(test.get_files(@globs), @files)
+    end
+
+    def test_get_files_excludes
+      test = Roger::Test.new({})
+      assert_equal(test.get_files(@globs, ["html\/vendor\/.+.js"]),
+                   ["html/javascripts/site.js"])
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roger
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Flurin Egger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,14 +30,14 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
@@ -72,28 +72,28 @@ dependencies:
   name: hpricot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.1
 - !ruby/object:Gem::Dependency
@@ -124,6 +124,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.10.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.10.0
 description: 
 email:
 - info@digitpaint.nl
@@ -143,6 +157,11 @@ files:
 - Rakefile
 - bin/roger
 - doc/cli.md
+- doc/images/logo_black-yellow.png
+- doc/images/logo_black-yellow.svg
+- doc/images/logo_plain-square.png
+- doc/images/logo_plain.png
+- doc/images/logo_plain.svg
 - doc/mockupfile.md
 - doc/templating.md
 - examples/default_template/.gitignore
@@ -187,6 +206,7 @@ files:
 - lib/roger/test.rb
 - roger.gemspec
 - test/Mockupfile-syntax.rb
+- test/helpers/cli.rb
 - test/project/.rvmrc
 - test/project/Gemfile
 - test/project/Gemfile.lock
@@ -222,6 +242,8 @@ files:
 - test/project/partials/test/yield.html.erb
 - test/project/partials2/partials2-test.html.erb
 - test/unit/cli/cli_base_test.rb
+- test/unit/cli/cli_generate_test.rb
+- test/unit/cli/cli_serve_test.rb
 - test/unit/cli/cli_test_test.rb
 - test/unit/generators_test.rb
 - test/unit/release/cleaner_test.rb
@@ -230,6 +252,7 @@ files:
 - test/unit/release_test.rb
 - test/unit/resolver_test.rb
 - test/unit/template_test.rb
+- test/unit/test_test.rb
 homepage: http://github.com/digitpaint/roger
 licenses:
 - MIT
@@ -241,22 +264,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Roger is a set of tools to create self-containing HTML mockups.
 test_files:
 - test/Mockupfile-syntax.rb
+- test/helpers/cli.rb
 - test/project/.rvmrc
 - test/project/Gemfile
 - test/project/Gemfile.lock
@@ -292,6 +316,8 @@ test_files:
 - test/project/partials/test/yield.html.erb
 - test/project/partials2/partials2-test.html.erb
 - test/unit/cli/cli_base_test.rb
+- test/unit/cli/cli_generate_test.rb
+- test/unit/cli/cli_serve_test.rb
 - test/unit/cli/cli_test_test.rb
 - test/unit/generators_test.rb
 - test/unit/release/cleaner_test.rb
@@ -300,3 +326,4 @@ test_files:
 - test/unit/release_test.rb
 - test/unit/resolver_test.rb
 - test/unit/template_test.rb
+- test/unit/test_test.rb