rest_shifter 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e47c747013e094a0bcd0ac00b58cd7c4686a7bcf
-  data.tar.gz: 5e9f5669d8c49410839ffb83cfdcf4d2b63ab180
+  metadata.gz: bcfeac378d6283957aa13e0741864fecfba830ea
+  data.tar.gz: ca958fb8a527a5f1613b3b059cc4a7831b64f1b5
 SHA512:
-  metadata.gz: e8301b6192a3eb44a2ab46518e1983c319aaf9a6f2a34efe97505914fb68c6dd6a535430346c40e666dff1a394877255939da170179770ee7dc307e2bd855181
-  data.tar.gz: 8894a08e1712079313b7e0b967eb3b000ea5364efd5f2fcdc4910c4a73321592d7514f8abd56003f0aeccae4e400d4bca0652e538c3f663f170ce3802be98953
+  metadata.gz: 043d1d2526447552cfd7377312d95caa454bf4660ab0abcc5f0fcb3df408b6c7ed351d65b62104b99ea352d62b5a608cbf7021ee282672080c9397c6c0886f98
+  data.tar.gz: b196c806b2a57d8e5f0fbf3641d6d761050ddd5ed99cecb741b1caabed96df9e4ad24c4072673ff825c44b91daf22080922ca35b9ead07ae0fbff109d6ae1fc3

data/lib/rest_shifter/commands/main.rb

@@ -11,8 +11,17 @@ class RestShifter::Commands::Main
         port = "8080" unless !port.to_s.empty?
         RestShifter::Commands::Start.run port
         exit 0
+      when "-X", "--start-secure-no-cert", "start-secure-no-cert"
+        port = args.shift 
+        port = "4443" unless !port.to_s.empty?
+        RestShifter::Commands::Start.run_secure_no_cert port
+        exit 0
       when "-S", "--start-secure", "start-secure"
-        RestShifter::Commands::Start.run_secure
+        port = args.shift 
+        cert = args.shift 
+        key = args.shift 
+        port = "4443" unless !port.to_s.empty?
+        RestShifter::Commands::Start.run_secure port, cert, key
         exit 0
       when "-c", "--create", "create"
         RestShifter::Commands::Create.run

data/lib/rest_shifter/commands/start.rb

@@ -8,6 +8,14 @@ class RestShifter::Commands::Start
       Shifter.run!
     end
 
+    def run_secure_no_cert(port=ARGV) 
+
+      prepare_server
+      Shifter.use Rack::SSL
+      Shifter.set :bind, '0.0.0.0'
+      Shifter.run_ssl! port.to_i, File.join(File.dirname(__FILE__), "../../fake_certs/localhost.cert"), File.join(File.dirname(__FILE__), "../../fake_certs/localhost.key")
+    end
+
     def run_secure(args=ARGV)
       port = args.shift
       crt = args.shift

data/lib/rest_shifter/shifter.rb

@@ -7,16 +7,16 @@ module RestShifter; end
 
 class Shifter < Sinatra::Base
 
-  def self.run_ssl! port, crt, key
+  def self.run_ssl! port, cert, key
     server_options = {
       :Port => port.to_i,
       :Host => bind,
       :SSLEnable => true,
-      :SSLCertificate => OpenSSL::X509::Certificate.new(File.open(crt).read),
+      :SSLCertificate => OpenSSL::X509::Certificate.new(File.open(cert).read),
       :SSLPrivateKey => OpenSSL::PKey::RSA.new(File.open(key).read),
       :SSLVerifyClient    => OpenSSL::SSL::VERIFY_NONE
     }
-
+    
     Rack::Handler::WEBrick.run self, server_options do |server|
       [:INT, :TERM].each { |sig| trap(sig) { server.stop } }
       server.threaded = settings.threaded if server.respond_to? :threaded=

data/lib/rest_shifter/version.rb

@@ -1,3 +1,3 @@
 module RestShifter 
-    VERSION = "0.0.24"
+    VERSION = "0.0.25"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest_shifter
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Camilo Ribeiro