oxy 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b4f150980fce178f915f13fe44e58c28ba838e1
-  data.tar.gz: 3ed19f03a1886eedb7e85985963f8f725bae1278
+  metadata.gz: c3a23994e0098c5d49df8b240845baa9340739e1
+  data.tar.gz: 0c2adf420f29e5d316ee2590005518d193532b51
 SHA512:
-  metadata.gz: 11740aa0c82135b68f1e2f09bbe4b614d7c792ba34e4663157c02a2b707e7584c9ec973c022109b6624c2868c355c7c8498e50de1d729c2329023433c2f12471
-  data.tar.gz: 32e47a9528601f5c40054d77eccbb9ec7acaf5dbf27ce8ce74b105e54db76a39a45fc57469a83b11951cb265446589e8e8cdf5ac477a659649bccab92bdeae53
+  metadata.gz: 03f74bad6f4c45d79fd5a106aef3c72a5c3a33ddeafcf5a2091bf962d8e40e5182112eb0a69dc6fcaec0c77f9ce6c0193e415b1bd74da8681b01e0f0d8addae4
+  data.tar.gz: 9f975637fc3477b4a6c3aa23824a7fdbcfd80010196481126d793c4f4bf95634040f21511911d189875116c87b593c30200eda8bab37cd339970f0e6ec087ea6

data/Gemfile

@@ -3,4 +3,4 @@ source "https://rubygems.org"
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in oxy.gemspec
-gemspec
+gemspec

data/Rakefile

@@ -7,4 +7,4 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
-task :default => :test
+task :default => :test

data/bin/oxy

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'oxy'
+
+Oxy::Server.new(ARGV).run

data/lib/oxy/server.rb

@@ -0,0 +1,115 @@
+require "optparse"
+require "ostruct"
+require "rack"
+require "rack/contrib"
+
+module Oxy
+  class Server
+    attr_accessor :options
+
+    attr_reader :stdout
+
+    def initialize(argv = [], stdin = $stdin, stdout = $stdout, stderr = $stderr)
+      @stdout = stdout
+      @options = OpenStruct.new
+      @parser = option_parser
+      # actually parse arguments input
+      parse_options(argv)
+    end
+
+    def run
+      # setup oxy's folder
+      FileUtils.mkdir_p(oxy_home_path) unless File.exist?(oxy_home_path)
+      # process user's options (if any)
+      miscellaneous
+      # start server's thread
+      server_thread = start_server
+      # wait for the server's thread to join
+      server_thread.join if server_thread
+    end
+
+  private
+    def oxy_home_path
+      "#{ENV["HOME"]}/oxy"
+    end
+
+    def static_site_app
+      # pin site_root_path
+      site_root_path = @options.document_root
+      # pin not_found_path file path
+      not_found_path = File.join(site_root_path, "404.html")
+      # build new app
+      stack = Rack::Builder.new {
+        use Rack::CommonLogger
+        use Rack::TryStatic, :urls => %w[/], :try => ['.html', 'index.html', '/index.html']
+        run Rack::NotFound.new(not_found_path)
+      }
+      return stack.to_app
+    end
+
+    def start_server
+      # instantiate our Rack server
+      @server = Rack::Server.new({
+        :app  => static_site_app,
+        :pid  => File.join(oxy_home_path,"oxy.pid"),
+        :Port => @options.port,
+        :Host => @options.address,
+        :environment => 'deployment',
+        :server => 'puma',
+        :daemonize => false
+      })
+      # spin the server
+      Thread.new { @server.start }
+    end
+
+    def parse_options(argv = [])
+      begin
+        # parse options input from the user
+        @parser.parse!(argv)
+        # set option defaults
+        @options.document_root = Dir.pwd unless @options.document_root
+        @options.port = 4000 unless @options.port
+      rescue OptionParser::ParseError => pe
+        msg = ["#{@parser.program_name}: #{pe}", "Try `#{@parser.program_name} --help` for more information"]
+        @options.error_message = msg.join("\n")
+      end
+    end
+
+    # Miscellaneous options simply renders the appropriate information to the output.
+    def miscellaneous
+      if @options.show_version then
+        @stdout.puts "#{@parser.program_name}: version #{Oxy::VERSION}"
+        exit 0
+      elsif @options.show_help then
+        @stdout.puts @parser.to_s
+        exit 0
+      elsif @options.error_message then
+        @stdout.puts @options.error_message
+        exit 1
+      end
+    end
+
+    def option_parser
+      # We derive our options from Puma to avoid confusion
+      OptionParser.new do |op|
+        op.separator ""
+        # parse help
+        op.on("-h", "--help", "Display this text") do
+          @options.show_help = true
+        end
+        # parse version
+        op.on("-V", "--version", "Show version") do
+          @options.show_version = true
+        end
+        # parse uri
+        op.on("-b", "--bind URI", "URI to bind to (tcp://, unix://, ssl://)") do |uri|
+          @options.uri = uri
+        end
+        # parse port no.
+        op.on("-p", "--port PORT", Integer, "Define the TCP port to bind to", "Use -b for more advanced options") do |port|
+          @options.port = port
+        end
+      end
+    end
+  end
+end

data/lib/oxy/version.rb

@@ -1,3 +1,3 @@
 module Oxy
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/oxy.rb

@@ -1,5 +1,3 @@
 require "oxy/version"
 
-module Oxy
-  # Your code goes here...
-end
+require 'oxy/server'

data/oxy.gemspec

@@ -16,11 +16,20 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.executables   = ["oxy".freeze]
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "rack", "~> 2.0"
+  spec.add_runtime_dependency "rack-contrib", "~> 1.2"
+  spec.add_runtime_dependency "puma", "~> 3.10"
+
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
+
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry-byebug"
+  spec.add_development_dependency "pry-doc"
+  spec.add_development_dependency "pry-rescue"
+  spec.add_development_dependency "pry-stack_explorer"
 end

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: oxy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Pavel Tsurbeleu
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2017-10-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rack-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,10 +94,81 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: pry-byebug
+  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: pry-doc
+  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: pry-rescue
+  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: pry-stack_explorer
+  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'
 description: 
 email:
 - pavel.tsurbeleu@me.com
-executables: []
+executables:
+- oxy
 extensions: []
 extra_rdoc_files: []
 files:
@@ -67,8 +180,10 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/oxy
 - bin/setup
 - lib/oxy.rb
+- lib/oxy/server.rb
 - lib/oxy/version.rb
 - oxy.gemspec
 homepage: http://oxy.io
@@ -91,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Oxy is a web server for static sites