usmu 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98c4d548d6ce9899b3072b1e20c221c897236c4b
-  data.tar.gz: b4e9bbe42c3daf79e419fc70e5fd9346cbfc289a
+  metadata.gz: a17b2f0a54894311de49ba082286ef8b42abdddb
+  data.tar.gz: b8b72e07ca7986addb70bf255ec6a18c15e6471c
 SHA512:
-  metadata.gz: b0b63588aba8d2c67cdfefe4b0e196d6fb22ac4fffb5a74eeb30fa0d4ee545927c0b9d21747736c741d1ffc11049a200be99434ea0ae7407f6b18d264e7ef2a9
-  data.tar.gz: 5007c6d0c1f35fbaa490fc5565f2c8dfb4aa7216e605740261c695d395c799e5d8adc23b262d93a87dbaf966a814f9b8254d50962b0af95c5dce003afaa6eeac
+  metadata.gz: 5783809764b9fee5b97a5879592f18b3766e50c82c9d4cfb1aadeb84e437c2b2bc079d1caf285e3af161209598c76685cd8ac29ee8adc3e2804351810ad6095c
+  data.tar.gz: f1d90b1aec2431e0d7c788ce09385179624c7a09121bdcbef5ed66fad5ce78276e2a0cde4b764cb610c2d7c366d6ec66ca169d69a570e60a7d41392babe9e256

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Usmu Change Log
 
+## 1.2.1
+
+Matthew Scharley <matt.scharley@gmail.com>
+
+* Remove useless gem (f1a9659a03c239da7348ce75e6fcf2f055c4079e)
+* Fix options to Rack to set hostname and port correctly (1364e9ee14bf2d79fd379363a0e2e820f9382e30)
+* Fix tests (edb9e246aee28b57d2a51a3bb310c76cf3474054)
+
 ## 1.2.0
 
 Matthew Scharley <matt.scharley@gmail.com>

data/lib/usmu/plugin/core.rb

@@ -78,8 +78,8 @@ module Usmu
         @log.info('Starting webserver...')
 
         Rack::Handler::WEBrick.run Ui::RackServer.new(configuration),
-                                   host: configuration['serve', 'host', default: 'localhost'],
-                                   port: configuration['serve', 'port', default: 8080]
+                                   Host: configuration['serve', 'host', default: 'localhost'],
+                                   Port: configuration['serve', 'port', default: 8080]
       end
 
       private

data/lib/usmu/version.rb

@@ -1,5 +1,5 @@
 
 module Usmu
   # The current version string for the gem
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/spec/usmu/plugin/core_spec.rb

@@ -1,5 +1,116 @@
 require 'usmu/plugin/core'
+require 'usmu/configuration'
+require 'usmu/mock_commander'
+require 'ostruct'
+require 'rack'
+require 'usmu/ui/rack_server'
 
 RSpec.describe Usmu::Plugin::Core do
+  let (:plugin) { described_class.new }
+  let (:configuration) { Usmu::Configuration.from_hash({}) }
+  let (:ui) { OpenStruct.new configuration: configuration }
+  let (:commander) { Usmu::MockCommander.new }
+  let (:options) { Commander::Command::Options.new }
 
+  context '#commands' do
+    it 'stores a the UI given to it' do
+      plugin.commands(ui, commander)
+
+      expect(plugin.send :ui).to eq(ui)
+      expect(@log_output.readline).to eq("  DEBUG  Usmu::Plugin::Core : Adding core console commands...\n")
+    end
+
+    it 'defines a "generate" command' do
+      plugin.commands(ui, commander)
+
+      command = commander.get_command :generate
+      expect(command[:syntax]).to eq('usmu generate')
+      expect(command[:description]).to eq('Generates your website using the configuration specified.')
+      expect(command[:action]).to be_a(Proc)
+    end
+
+    it 'defines a "init" command' do
+      plugin.commands(ui, commander)
+
+      command = commander.get_command :init
+      expect(command[:syntax]).to eq('usmu init [path]')
+      expect(command[:description]).to eq('Initialise a new website in the given path, or the current directory if none given.')
+      expect(command[:action]).to be_a(Proc)
+    end
+
+    it 'defines a "serve" command' do
+      plugin.commands(ui, commander)
+
+      command = commander.get_command :serve
+      expect(command[:syntax]).to eq('usmu serve')
+      expect(command[:description]).to eq('Serve files processed files directly. This won\'t update files on disk, but you will be able to view your website as rendered.')
+      expect(command[:action]).to be_a(Proc)
+    end
+  end
+
+  context '#command_generate' do
+    it 'raises an error when arguments are specified' do
+      expect { plugin.command_generate(['foo'], options) }.to raise_error('This command does not take arguments')
+    end
+
+    it 'raises an error when invalid options are specified' do
+      expect { plugin.command_generate([], []) }.to raise_error('Invalid options')
+    end
+
+    it 'should generate a site' do
+      expect(configuration.generator).to receive(:generate)
+
+      plugin.send :ui=, ui
+      plugin.command_generate [], options
+    end
+  end
+
+  context '#command_init' do
+    it 'should do something'
+  end
+
+  context '#command_serve' do
+    let (:empty_configuration) { Usmu::Configuration.from_hash({}) }
+    let (:configuration) {
+      Usmu::Configuration.from_hash(
+          {
+              'serve' => {
+                  'host' => '0.0.0.0',
+                  'port' => 8008,
+              }
+          }
+      )
+    }
+    let (:rs) { OpenStruct.new }
+
+    before do
+      allow(Usmu::Ui::RackServer).to receive(:new).with(empty_configuration).and_return(rs)
+      allow(Usmu::Ui::RackServer).to receive(:new).with(configuration).and_return(rs)
+    end
+
+    it 'raises an error when arguments are specified' do
+      expect { plugin.command_serve(['foo'], options) }.to raise_error('This command does not take arguments')
+    end
+
+    it 'raises an error when invalid options are specified' do
+      expect { plugin.command_serve([], []) }.to raise_error('Invalid options')
+    end
+
+    it 'should start a WEBrick Rack handler with a new RackServer UI' do
+      plugin.send :ui=, OpenStruct.new(configuration: empty_configuration)
+      expect(Rack::Handler::WEBrick).to receive(:run).with(rs, Host: 'localhost', Port: 8080)
+      plugin.command_serve [], options
+      expect(@log_output.readline).to eq("   INFO  Usmu::Plugin::Core : Starting webserver...\n")
+    end
+
+    it 'should take hostname and ports from the configuration file' do
+      plugin.send :ui=, OpenStruct.new(configuration: configuration)
+      expect(Rack::Handler::WEBrick).to receive(:run).with(rs, Host: '0.0.0.0', Port: 8008)
+      plugin.command_serve [], options
+    end
+  end
+
+  context '#init_copy_file' do
+    it 'should do something'
+  end
 end

data/spec/usmu/site_generator_spec.rb

@@ -95,9 +95,8 @@ RSpec.describe Usmu::SiteGenerator do
     end
 
     it 'should write a file and update mtime to match source files' do
-      page = OpenStruct.new name: 'test.slim', input_path: 'src/test.slim', output_filename: 'test.html', render: '<!DOCTYPE html><h1>It works!</h1>'
+      page = OpenStruct.new name: 'test.slim', input_path: 'src/test.slim', output_filename: 'test.html', render: '<!DOCTYPE html><h1>It works!</h1>', mtime: 100
       expect(File).to receive(:write).with('site/test.html', '<!DOCTYPE html><h1>It works!</h1>')
-      expect(File).to receive(:stat).with('src/test.slim').and_return(OpenStruct.new mtime: 100)
       expect(FileUtils).to receive(:touch).with('site/test.html', mtime: 100).and_return(true)
       expect(FileUtils).to_not receive(:mkdir_p)
 
@@ -108,9 +107,8 @@ RSpec.describe Usmu::SiteGenerator do
     end
 
     it 'should create directories as necessary' do
-      page = OpenStruct.new name: 'test.slim', input_path: 'src/subdir/test.slim', output_filename: 'subdir/test.html', render: '<!DOCTYPE html><h1>It works!</h1>'
+      page = OpenStruct.new name: 'test.slim', input_path: 'src/subdir/test.slim', output_filename: 'subdir/test.html', render: '<!DOCTYPE html><h1>It works!</h1>', mtime: 100
       expect(File).to receive(:write).with('site/subdir/test.html', '<!DOCTYPE html><h1>It works!</h1>')
-      expect(File).to receive(:stat).with('src/subdir/test.slim').and_return(OpenStruct.new mtime: 100)
       expect(FileUtils).to receive(:touch).with('site/subdir/test.html', mtime: 100).and_return(true)
       expect(FileUtils).to receive(:mkdir_p).with('site/subdir')
 

data/usmu.gemspec

@@ -38,7 +38,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-rspec', '~> 4.3'
   spec.add_development_dependency 'turnip', '~> 2.0'
   spec.add_development_dependency 'sass', '~> 3.4'
-  spec.add_development_dependency 'timeout', '~> 0.0'
 
   case ENV['BUILD_PLATFORM']
     when 'ruby'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usmu
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Matthew Scharley
@@ -206,20 +206,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: timeout
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -304,7 +290,6 @@ files:
 - spec/mock/usmu/mock_metadata_configuration.rb
 - spec/mock/usmu/mock_plugin.rb
 - spec/mock/usmu/mock_remote_files.rb
-- spec/plugin/core_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_layout.rb
 - spec/usmu/configuration_spec.rb
@@ -384,7 +369,6 @@ test_files:
 - spec/mock/usmu/mock_metadata_configuration.rb
 - spec/mock/usmu/mock_plugin.rb
 - spec/mock/usmu/mock_remote_files.rb
-- spec/plugin/core_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_layout.rb
 - spec/usmu/configuration_spec.rb

data/spec/plugin/core_spec.rb

@@ -1,116 +0,0 @@
-require 'usmu/plugin/core'
-require 'usmu/configuration'
-require 'usmu/mock_commander'
-require 'ostruct'
-require 'rack'
-require 'usmu/ui/rack_server'
-
-RSpec.describe Usmu::Plugin::Core do
-  let (:plugin) { described_class.new }
-  let (:configuration) { Usmu::Configuration.from_hash({}) }
-  let (:ui) { OpenStruct.new configuration: configuration }
-  let (:commander) { Usmu::MockCommander.new }
-  let (:options) { Commander::Command::Options.new }
-
-  context '#commands' do
-    it 'stores a the UI given to it' do
-      plugin.commands(ui, commander)
-
-      expect(plugin.send :ui).to eq(ui)
-      expect(@log_output.readline).to eq("  DEBUG  Usmu::Plugin::Core : Adding core console commands...\n")
-    end
-
-    it 'defines a "generate" command' do
-      plugin.commands(ui, commander)
-
-      command = commander.get_command :generate
-      expect(command[:syntax]).to eq('usmu generate')
-      expect(command[:description]).to eq('Generates your website using the configuration specified.')
-      expect(command[:action]).to be_a(Proc)
-    end
-
-    it 'defines a "init" command' do
-      plugin.commands(ui, commander)
-
-      command = commander.get_command :init
-      expect(command[:syntax]).to eq('usmu init [path]')
-      expect(command[:description]).to eq('Initialise a new website in the given path, or the current directory if none given.')
-      expect(command[:action]).to be_a(Proc)
-    end
-
-    it 'defines a "serve" command' do
-      plugin.commands(ui, commander)
-
-      command = commander.get_command :serve
-      expect(command[:syntax]).to eq('usmu serve')
-      expect(command[:description]).to eq('Serve files processed files directly. This won\'t update files on disk, but you will be able to view your website as rendered.')
-      expect(command[:action]).to be_a(Proc)
-    end
-  end
-
-  context '#command_generate' do
-    it 'raises an error when arguments are specified' do
-      expect { plugin.command_generate(['foo'], options) }.to raise_error('This command does not take arguments')
-    end
-
-    it 'raises an error when invalid options are specified' do
-      expect { plugin.command_generate([], []) }.to raise_error('Invalid options')
-    end
-
-    it 'should generate a site' do
-      expect(configuration.generator).to receive(:generate)
-
-      plugin.send :ui=, ui
-      plugin.command_generate [], options
-    end
-  end
-
-  context '#command_init' do
-    it 'should do something'
-  end
-
-  context '#command_serve' do
-    let (:empty_configuration) { Usmu::Configuration.from_hash({}) }
-    let (:configuration) {
-      Usmu::Configuration.from_hash(
-          {
-              'serve' => {
-                  'host' => '0.0.0.0',
-                  'port' => 8008,
-              }
-          }
-      )
-    }
-    let (:rs) { OpenStruct.new }
-
-    before do
-      allow(Usmu::Ui::RackServer).to receive(:new).with(empty_configuration).and_return(rs)
-      allow(Usmu::Ui::RackServer).to receive(:new).with(configuration).and_return(rs)
-    end
-
-    it 'raises an error when arguments are specified' do
-      expect { plugin.command_serve(['foo'], options) }.to raise_error('This command does not take arguments')
-    end
-
-    it 'raises an error when invalid options are specified' do
-      expect { plugin.command_serve([], []) }.to raise_error('Invalid options')
-    end
-
-    it 'should start a WEBrick Rack handler with a new RackServer UI' do
-      plugin.send :ui=, OpenStruct.new(configuration: empty_configuration)
-      expect(Rack::Handler::WEBrick).to receive(:run).with(rs, host: 'localhost', port: 8080)
-      plugin.command_serve [], options
-      expect(@log_output.readline).to eq("   INFO  Usmu::Plugin::Core : Starting webserver...\n")
-    end
-
-    it 'should take hostname and ports from the configuration file' do
-      plugin.send :ui=, OpenStruct.new(configuration: configuration)
-      expect(Rack::Handler::WEBrick).to receive(:run).with(rs, host: '0.0.0.0', port: 8008)
-      plugin.command_serve [], options
-    end
-  end
-
-  context '#init_copy_file' do
-    it 'should do something'
-  end
-end