rackula 0.6.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b234337043ec82c82b2dc1059e3ddcf807d23a88ef01333c18790225c137ed8a
-  data.tar.gz: cb9e5775986c4048abb880728326449d2e567bc2719a347c09a9e72acfd6f86b
+  metadata.gz: b249cc4bf0e7bb535b6ece14d8dce90b558a98c5f7921e735cb851341a36551f
+  data.tar.gz: 2ff7b7e2ea8e11abc58a6f73aab66548e82cbcb993fcd79c3ef4218024343cfa
 SHA512:
-  metadata.gz: 396e2ac1a6553b7d3d72b2b63ec019031311f2681ebab09987ce3cb3279e69d05208efbb80005b4ae1b8de6b8c81bf86a791d828d48e15e610663baa8271f26b
-  data.tar.gz: b5b6d775d30ef82a9efecb60ab7df5ac0c4a0bfb93610c4c9a8f5241a13458a93348df1dd444afe4da488b51289156950425f50130854fccace662929e9b1308
+  metadata.gz: dfab9891149e0474e8b0649282a9931a96bdf3bfaa9bc72948e2e82f5b4889ede982944ae39384637b3c1da12d347ba9b772c86f01b431ef34c32642dd6b4276
+  data.tar.gz: 38ee786386165c2e06ced60ab591b5aa1141530f6603adc14e5db7a9f2a20ef0b797ebc1a9ab157543660176cde326e9b0382f55b315cbd95a394d9b4b3fb75e

data/.editorconfig

@@ -0,0 +1,6 @@
+root = true
+
+[*]
+indent_style = tab
+indent_size = 2
+

data/.travis.yml

@@ -1,15 +1,17 @@
 language: ruby
-sudo: false
 cache: bundler
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-  - jruby-head
-  - ruby-head
-env: COVERAGE=true
+
 matrix:
+  include:
+    - rvm: 2.3
+    - rvm: 2.4
+    - rvm: 2.5
+    - rvm: 2.6
+      env: COVERAGE=BriefSummary,Coveralls
+    - rvm: ruby-head
+    - rvm: jruby-head
+    - rvm: truffleruby
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
+    - rvm: truffleruby

data/bin/rackula

@@ -22,9 +22,4 @@
 
 require 'rackula/command'
 
-begin
-	Rackula::Command.parse(ARGV).invoke
-rescue Samovar::Failure
-	puts "Failed: #{$!.message}"
-	exit 1
-end
+Rackula::Command.call

data/lib/rackula/command.rb

@@ -24,8 +24,8 @@ require_relative 'command/generate'
 
 module Rackula
 	module Command
-		def self.parse(*args)
-			Top.parse(*args)
+		def self.call(*args)
+			Top.call(*args)
 		end
 		
 		# The top level utopia command.
@@ -38,23 +38,22 @@ module Rackula
 				option '-v/--version', "Print out the application version."
 			end
 			
-			nested '<command>',
+			nested :command, {
 				'generate' => Generate
+			}, default: 'generate'
 			
 			# The root directory for the site.
 			def root
 				File.expand_path(@options.fetch(:root, ''), Dir.getwd)
 			end
 			
-			def invoke(program_name: File.basename($0))
+			def call
 				if @options[:version]
-					puts "utopia v#{VERSION}"
-				elsif @options[:help] or @command.nil?
-					print_usage(program_name)
+					puts "#{self.name} v#{VERSION}"
+				elsif @options[:help]
+					print_usage(output: $stdout)
 				else
-					track_time do
-						@command.invoke(self)
-					end
+					@command.call
 				end
 			end
 		end

data/lib/rackula/command/generate.rb

@@ -36,13 +36,13 @@ module Rackula
 			self.description = "Start a local server and generate a static version of a site."
 			
 			options do
-				option '-c/--config <path>', "Rackup configuration file to load", default: 'config.ru'
-				option '-p/--public <path>', "The public path to copy initial files from", default: 'public'
-				option '-o/--output-path <path>', "The output path to save static site", default: 'static'
+				option '-c/--config <path>', "Rackup configuration file to load.", default: 'config.ru'
+				option '-p/--public <path>', "The public path to copy initial files from.", default: 'public'
+				option '-o/--output-path <path>', "The output path to save static site.", default: 'static'
 				
 				option '-f/--force', "If the output path exists, delete it.", default: false
 				
-				option '--concurrency', "The concurrency of the server container", default: 4
+				option '--count', "The number of server instances to spawn.", default: 4
 			end
 			
 			def copy_and_fetch(port, root)
@@ -68,11 +68,11 @@ module Rackula
 				end
 				
 				# Generate HTML pages:
-				system!("wget", "--mirror", "--recursive", "--continue", "--convert-links", "--adjust-extension", "--no-host-directories", "--directory-prefix", output_path.to_s, "http://localhost:#{port}")
+				system("wget", "--mirror", "--recursive", "--continue", "--convert-links", "--adjust-extension", "--no-host-directories", "--directory-prefix", output_path.to_s, "http://localhost:#{port}")
 			end
 			
 			def serve(endpoint, root)
-				container_class = Async::Container::Threaded
+				container = Async::Container::Threaded.new
 				
 				config_path = root + @options[:config]
 				rack_app, options = Rack::Builder.parse_file(config_path.to_s)
@@ -80,7 +80,7 @@ module Rackula
 				app = ::Falcon::Server.middleware(rack_app, verbose: @options[:verbose])
 				server = ::Falcon::Server.new(app, endpoint)
 				
-				container = container_class.new(concurrency: @options[:concurrency]) do
+				container.run(count: @options[:count]) do
 					server.run
 				end
 			end
@@ -94,10 +94,10 @@ module Rackula
 				# puts "Copy and fetch site to static..."
 				copy_and_fetch(address.ip_port, root)
 			ensure
-				container.stop if container
+				container&.stop
 			end
 			
-			def invoke(parent)
+			def call
 				# We set the default RACK_ENV to static unless it was already set to something.
 				ENV['RACK_ENV'] ||= 'static'
 				

data/lib/rackula/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Rackula
-	VERSION = "0.6.0"
+	VERSION = "1.0.0"
 end

data/rackula.gemspec

@@ -18,10 +18,11 @@ Gem::Specification.new do |spec|
 	spec.executables   = spec.files.grep(%r{^bin/}) {|f| File.basename(f)}
 	spec.require_paths = ["lib"]
 
-	spec.add_dependency "samovar", "~> 1.8"
-	spec.add_dependency "falcon", "~> 0.19.0"
+	spec.add_dependency "samovar", "~> 2.1"
+	spec.add_dependency "falcon", "~> 0.27"
 
-	spec.add_development_dependency "bundler", "~> 1.15"
+	spec.add_development_dependency "covered"
+	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "rake", "~> 10.0"
 	spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rackula
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-01 00:00:00.000000000 Z
+date: 2019-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: samovar
@@ -16,42 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: falcon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: '0.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: '0.27'
+- !ruby/object:Gem::Dependency
+  name: covered
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +102,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -119,8 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Generate a static site from any rackup compatible application.