rackula 1.0.0 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b249cc4bf0e7bb535b6ece14d8dce90b558a98c5f7921e735cb851341a36551f
-  data.tar.gz: 2ff7b7e2ea8e11abc58a6f73aab66548e82cbcb993fcd79c3ef4218024343cfa
+  metadata.gz: '0281af1617fada7ee4c90875d489a0f681c45164fb4941718ddff54754e67a30'
+  data.tar.gz: 727840b9497c08f9a31b13ffda2fa584c642bc00697c29370b30a04a360d4f52
 SHA512:
-  metadata.gz: dfab9891149e0474e8b0649282a9931a96bdf3bfaa9bc72948e2e82f5b4889ede982944ae39384637b3c1da12d347ba9b772c86f01b431ef34c32642dd6b4276
-  data.tar.gz: 38ee786386165c2e06ced60ab591b5aa1141530f6603adc14e5db7a9f2a20ef0b797ebc1a9ab157543660176cde326e9b0382f55b315cbd95a394d9b4b3fb75e
+  metadata.gz: 8b9f2d4ce3a41e1aaae806ea69d59f2673617105d874bdd42414eb2e60d8f05afcd4a2d22fd06fd560b9faee7b0ffebb685ae119ab3bf6cce8b093112172a4ab
+  data.tar.gz: 2a2309ce12cc4679863fe97bc0d7f209ed9f20c9b968b28b86bacf099b086ce38a7738f074d3a29afd51c89cec77b27514741b2f950c8abb6664d571536d00ce

data/lib/rackula/command/generate.rb

@@ -21,6 +21,7 @@
 require 'samovar'
 
 require 'pathname'
+require 'fileutils'
 require 'rack'
 
 require 'falcon/server'
@@ -29,6 +30,8 @@ require 'async/io'
 require 'async/container'
 require 'async/http'
 
+require 'variant'
+
 module Rackula
 	module Command
 		# Server setup commands.
@@ -41,8 +44,6 @@ module Rackula
 				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 '--count', "The number of server instances to spawn.", default: 4
 			end
 			
 			def copy_and_fetch(port, root)
@@ -57,7 +58,7 @@ module Rackula
 						raise Samovar::Failure.new("Output path already exists!")
 					end
 				end
-
+				
 				# Create output directory
 				Dir.mkdir(output_path)
 				
@@ -72,23 +73,31 @@ module Rackula
 			end
 			
 			def serve(endpoint, root)
-				container = Async::Container::Threaded.new
+				container = Async::Container.new
 				
 				config_path = root + @options[:config]
-				rack_app, options = Rack::Builder.parse_file(config_path.to_s)
-				
-				app = ::Falcon::Server.middleware(rack_app, verbose: @options[:verbose])
-				server = ::Falcon::Server.new(app, endpoint)
 				
-				container.run(count: @options[:count]) do
-					server.run
+				container.run do |instance|
+					Async do
+						rack_app, _ = Rack::Builder.parse_file(config_path.to_s)
+						app = ::Falcon::Server.middleware(rack_app, verbose: @options[:verbose])
+						server = ::Falcon::Server.new(app, endpoint)
+						
+						instance.ready!
+						
+						server.run
+					end
 				end
+				
+				container.wait_until_ready
+				
+				return container
 			end
 			
 			def run(address, root)
-				endpoint = Async::HTTP::URLEndpoint.parse("http://localhost", port: address.ip_port, reuse_port: true)
+				endpoint = Async::HTTP::Endpoint.parse("http://localhost", port: address.ip_port, reuse_port: true)
 				
-				puts "Setting up container to serve site on port #{address.ip_port}..."
+				Console.logger.info(self) {"Setting up container to serve site on port #{address.ip_port}..."}
 				container = serve(endpoint, root)
 				
 				# puts "Copy and fetch site to static..."
@@ -98,17 +107,14 @@ module Rackula
 			end
 			
 			def call
-				# We set the default RACK_ENV to static unless it was already set to something.
-				ENV['RACK_ENV'] ||= 'static'
+				Variant.force!('static')
 				
-				Async::Reactor.run do
-					endpoint = Async::IO::Endpoint.tcp("localhost", 0, reuse_port: true)
-					
-					# We bind to a socket to generate a temporary port:
-					endpoint.bind do |socket|
-						run(socket.local_address, Pathname.new(parent.root))
-					end
-				end
+				endpoint = Async::IO::Endpoint.tcp("localhost", 0, reuse_port: true)
+				
+				# We bind to a socket to generate a temporary port:
+				socket = Sync{endpoint.each.first.bind}
+				
+				run(socket.local_address, Pathname.new(parent.root))
 			end
 		end
 	end

data/lib/rackula/version.rb

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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rackula
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.3
 platform: ruby
 authors:
 - Samuel Williams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2021-07-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: falcon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.34'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.34'
 - !ruby/object:Gem::Dependency
   name: samovar
   requirement: !ruby/object:Gem::Requirement
@@ -25,21 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: falcon
+  name: variant
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.27'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.27'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: covered
+  name: bake-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: covered
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -94,32 +108,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
+description:
 email:
-- samuel.williams@oriontransfer.co.nz
 executables:
 - rackula
 extensions: []
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- Gemfile
-- README.md
-- Rakefile
 - bin/rackula
 - lib/rackula.rb
 - lib/rackula/command.rb
 - lib/rackula/command/generate.rb
 - lib/rackula/version.rb
-- rackula.gemspec
 homepage: https://github.com/socketry/rackula
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -134,8 +139,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Generate a static site from any rackup compatible application.
 test_files: []

data/.editorconfig

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

data/.gitignore

@@ -1,12 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-# rspec failure tracking
-.rspec_status

data/.rspec

@@ -1,4 +0,0 @@
---format documentation
---backtrace
---require spec_helper
---warnings

data/.travis.yml

@@ -1,17 +0,0 @@
-language: ruby
-cache: bundler
-
-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/Gemfile

@@ -1,9 +0,0 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in rackula.gemspec
-gemspec
-
-group :test do
-	gem 'simplecov'
-	gem 'coveralls', require: false
-end

data/README.md

@@ -1,62 +0,0 @@
-# Rackula
-
-Rackula will immortalize your rackup web app by generating a static copy. It can be used to generate a static site from any rack-compatible middleware (e.g. rails, sinatra, utopia).
-
-[![Build Status](https://secure.travis-ci.org/socketry/rackula.svg)](http://travis-ci.org/socketry/rackula)
-[![Coverage Status](https://coveralls.io/repos/socketry/rackula/badge.svg)](https://coveralls.io/r/socketry/rackula)
-
-## Installation
-
-Install the gem:
-
-	$ gem install rackula
-
-Ensure that `wget` is installed and available.
-
-## Usage
-
-### Rack Applications
-
-In the root directory, simply run `rackula`. It will generate a static site in `static`. For more details about how to change the default behavior, run `rackula --help`.
-
-### Rails Applications
-
-Add a `config.ru` file to your rails app and follow the above instructions.
-
-```ruby
-# config.ru for rails app
-require_relative 'config/environment'
-run Rails.application
-```
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
-## License
-
-Released under the MIT license.
-
-Copyright, 2017, by [Samuel G. D. Williams](http://www.codeotaku.com/samuel-williams).
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/Rakefile

@@ -1,6 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec

data/rackula.gemspec

@@ -1,28 +0,0 @@
-
-require_relative "lib/rackula/version"
-
-Gem::Specification.new do |spec|
-	spec.name          = "rackula"
-	spec.version       = Rackula::VERSION
-	spec.authors       = ["Samuel Williams"]
-	spec.email         = ["samuel.williams@oriontransfer.co.nz"]
-
-	spec.summary       = "Generate a static site from any rackup compatible application."
-	spec.homepage      = "https://github.com/socketry/rackula"
-	spec.license       = "MIT"
-
-	spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-		f.match(%r{^(test|spec|features)/})
-	end
-
-	spec.executables   = spec.files.grep(%r{^bin/}) {|f| File.basename(f)}
-	spec.require_paths = ["lib"]
-
-	spec.add_dependency "samovar", "~> 2.1"
-	spec.add_dependency "falcon", "~> 0.27"
-
-	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