m2config 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3c76efc6317bc7fe641bd3c978cff4f78cd30c5
-  data.tar.gz: beea61d1cb3737e3bec50ad83ee8e3a79bd7ee00
+  metadata.gz: afd22b0a55c4bab36dab2e2b4513ece7ee7d8298
+  data.tar.gz: 91c4d8efc772ee183fedacc2539f4b8052126435
 SHA512:
-  metadata.gz: 9d40a5251991dbe74307fefe85635deefe7b78b2b524b1d2d498cc1f7407c27094304020b5f6775217e5fa99341ece612e094938a4cb138b3b86f00ce2efb4c0
-  data.tar.gz: 125c81887b1b5d5fad1154bc1d6a80055c35b9a58069f36a0ee4359b22ebc2aa00e49d6b567d1aa53cd92dc4377e9cec58c887c36ce36309c3d25dc1ee5be394
+  metadata.gz: 7446db6384946fc6e03ac1b8c8dabc5e9adb42ac21ea864b60d1aaf3601563a08b40f735a21e6acef3180d9f4956b8d368a84eafd04c07a9814b3b4aac296ca9
+  data.tar.gz: b29931e593e44eaa2af9fe3e94a1db86878475aff8d2249a8ebcd9983b07ba4343569068b161e47d4f2efe3dc9b48e6cb23fd60958a155746033ce3be40a8450

data/Gemfile

@@ -5,8 +5,8 @@ gemspec
 group :dev do
   gem 'guard'
   gem 'rb-inotify'
-  gem 'rspec', '~> 2.13'
-  gem 'guard-rspec'
+  gem 'rspec', '~> 3'
+#  gem 'guard-rspec'
   gem 'libnotify'
   gem 'pry'
   gem 'pry-nav'

data/lib/m2config/schema.sql

@@ -30,14 +30,15 @@ CREATE TABLE route (id INTEGER PRIMARY KEY,
     target_type TEXT);
 CREATE TABLE server (id INTEGER PRIMARY KEY,
     uuid TEXT,
-    default_host TEXT,
-    bind_addr TEXT DEFAULT "0.0.0.0",
-    port INTEGER,
-    chroot TEXT DEFAULT '/var/www',
     access_log TEXT,
     error_log TEXT,
+    chroot TEXT DEFAULT '/var/www',
     pid_file TEXT,
     control_port TEXT DEFAULT "",
+    default_host TEXT,
+    name TEXT DEFAULT '',
+    bind_addr TEXT DEFAULT "0.0.0.0",
+    port INTEGER,
     use_ssl INTEGER default 0);
 CREATE TABLE setting (id INTEGER PRIMARY KEY, key TEXT, value TEXT);
 CREATE TABLE statistic (id SERIAL, 

data/lib/m2config/server.rb

@@ -6,6 +6,7 @@ module M2Config
     CONTROL_PORT = ''
     CHROOT = './'
     DEFAULT_HOST = 'localhost'
+    NAME = 'main'
     BIND_ADDR = '0.0.0.0'
     PORT = 6767
     USE_SSL = 0
@@ -19,9 +20,11 @@ module M2Config
       fields[:pid_file]     ||= PID_FILE
       fields[:chroot]       ||= CHROOT
       fields[:default_host] ||= DEFAULT_HOST
+      fields[:name]         ||= NAME
       fields[:bind_addr]    ||= BIND_ADDR
       fields[:port]         ||= PORT
       fields[:use_ssl]      ||= USE_SSL
+      fields[:control_port] ||= CONTROL_PORT
       super fields, false
       save
     end

data/lib/m2config/version.rb

@@ -1,3 +1,3 @@
 module M2Config
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/spec/dir_spec.rb

@@ -5,17 +5,17 @@ describe M2Config::Dir do
   describe "::new" do
     it "needs to know the base path to handle" do
       M2Config::Dir.new({base:"images/"})
-      CFG.db[:directory].first[:base].should eq("images/")
+      expect(CFG.db[:directory].first[:base]).to eq("images/")
     end
     
     it "defaults to application/octet-stream for the default content type" do
       M2Config::Dir.new({base:"images/"})
-      CFG.db[:directory].first[:default_ctype].should eq("application/octet-stream")
+      expect(CFG.db[:directory].first[:default_ctype]).to eq("application/octet-stream")
     end
     
     it "defaults to index.html for the index file" do
       dir = M2Config::Dir.new({base:"/"})
-      CFG.db[:directory].first[:index_file].should eq("index.html")
+      expect(CFG.db[:directory].first[:index_file]).to eq("index.html")
     end
   
     describe "helps you spot common mistakes" do
@@ -40,7 +40,7 @@ describe M2Config::Dir do
   
   describe '#type' do
     it 'returns its type' do
-      M2Config::Dir.new({base:"/"}).type.should eq("dir")
+      expect(M2Config::Dir.new({base:"/"}).type).to eq("dir")
     end
   end
 

data/spec/handler_spec.rb

@@ -9,9 +9,9 @@ describe M2Config::Handler do
                               recv_spec:"tcp://10.0.0.1:9898",
                               send_ident: "dev.example.com ID"})
       res = CFG.db[:handler].first
-      res[:send_spec].should eq("tcp://10.0.0.1:8989")
-      res[:recv_spec].should eq("tcp://10.0.0.1:9898")
-      res[:send_ident].should eq("dev.example.com ID")
+      expect(res[:send_spec]).to eq("tcp://10.0.0.1:8989")
+      expect(res[:recv_spec]).to eq("tcp://10.0.0.1:9898")
+      expect(res[:send_ident]).to eq("dev.example.com ID")
     end
   
     it "turns nil into empty string when recv_ident is not set" do
@@ -19,7 +19,7 @@ describe M2Config::Handler do
                               recv_spec:"tcp://10.0.0.1:9898",
                               send_ident: "dev.example.com ID"})
       res = CFG.db[:handler].first
-      res[:recv_ident].should be_empty
+      expect(res[:recv_ident]).to be_empty
     end
     
     describe "helps you spot common mistakes" do
@@ -34,7 +34,7 @@ describe M2Config::Handler do
   
   describe '#type' do
     it 'returns its type' do
-      M2Config::Handler.new({send_spec:"tcp://10.0.0.1:8988", recv_spec:"tcp://10.0.0.1:8989", send_ident: "dev.example.com ID"}).type.should eq("handler")
+      expect(M2Config::Handler.new({send_spec:"tcp://10.0.0.1:8988", recv_spec:"tcp://10.0.0.1:8989", send_ident: "dev.example.com ID"}).type).to eq("handler")
     end
   end
 end

data/spec/host_spec.rb

@@ -9,21 +9,21 @@ describe M2Config::Host do
     it "needs to know the domain name served" do
       M2Config::Host.new({matching:"example.com", name: "ex"})
       res = CFG.db[:host].first
-      res[:matching].should eq("example.com")
+      expect(res[:matching]).to eq("example.com")
     end
     
     it "can use the uuid of a server" do
       host = M2Config::Host.new({matching:"example.com", name: "ex", srvUuid: @srv.uuid})
       res = CFG.db[:host].where(id: host.id).first
-      res[:server_id].should eq(@srv.id)
-      res[:matching].should eq("example.com")
+      expect(res[:server_id]).to eq(@srv.id)
+      expect(res[:matching]).to eq("example.com")
     end
   
     it "can use a server instance" do
       host = M2Config::Host.new({matching:"example.com", name: "ex", srv: @srv})
       res = CFG.db[:host].where(id: host.id).first
-      res[:server_id].should eq(@srv.id)
-      res[:matching].should eq("example.com")
+      expect(res[:server_id]).to eq(@srv.id)
+      expect(res[:matching]).to eq("example.com")
     end
   
     it "enforces mongrel2 constraint about nil name" do
@@ -40,7 +40,7 @@ describe M2Config::Host do
       dirR = M2Config::Route.new({path:"/blog", target: dirH})
       host.add_route dirR
       res = CFG.db[:route].first
-      res[:host_id].should eq(host.id)
+      expect(res[:host_id]).to eq(host.id)
     end
   end
   
@@ -51,7 +51,7 @@ describe M2Config::Host do
       dir2 = M2Config::Dir.new({base: "images/"})
       host.add_route M2Config::Route.new({path:"/blog1", target: dir1})
       host.add_route M2Config::Route.new({path:"/blog1", target: dir2})
-      host.check_routes.should be_false
+      expect(host.check_routes).to be_falsey
     end
 
     it 'returns true if all routes have different paths'  do
@@ -62,12 +62,12 @@ describe M2Config::Host do
       r2 = M2Config::Route.new({path:"/images", target: dir2})
       host.add_route r1
       host.add_route r2
-      host.check_routes.should be_true
+      expect(host.check_routes).to be_truthy
     end
 
     it 'withstands the idea of not having any routes'  do # , {focus: true}
       host = M2Config::Host.new({matching:"example.com", name: "ex"})
-      host.check_routes.should be_true
+      expect(host.check_routes).to be_truthy
     end
   end
 

data/spec/m2config_spec.rb

@@ -6,12 +6,12 @@ describe M2Config do
   
   describe "::new" do
     it 'creates a default database when name absent' do
-      File.should exist DEFAULT_DB_NAME
+      expect(File).to exist DEFAULT_DB_NAME
     end
   
     it 'learns the DB schema from the official schema dump' do
       for table in TABLES do
-        M2Config::Config.tables.should include table
+        expect(M2Config::Config.tables).to include table
       end
     end
   
@@ -22,15 +22,15 @@ describe M2Config do
     end
   
     it 'populates the MIME table with a nice set of mappings' do
-      M2Config::MimeType[extension:".html"].mimetype.should eq("text/html")
-      M2Config::MimeType[extension:".css"].mimetype.should eq("text/css")
+      expect(M2Config::MimeType[extension:".html"].mimetype).to eq("text/html")
+      expect(M2Config::MimeType[extension:".css"].mimetype).to eq("text/css")
     end
   end
   
   describe '#[]=' do
     it 'creates or modifies the value of a setting' do
       CFG["zeromq.threads"] = 8
-      CFG.db[:setting].where(key:"zeromq.threads").first[:value].should eq("8")
+      expect(CFG.db[:setting].where(key:"zeromq.threads").first[:value]).to eq("8")
     end
   end
 

data/spec/mimetype_spec.rb

@@ -16,7 +16,8 @@ describe M2Config::MimeType do
     end
   
     it 'allows you to force the redefinition of an existing extension' do
-      pending
+      skip
+      fail
     end
   end
   
@@ -26,7 +27,7 @@ describe M2Config::MimeType do
       CFG.db[:mimetype].delete
       M2Config::MimeType.populate_table()
 #      M2Config::MimeType.populate_table(nil,ignoreDoubles=true)
-      M2Config::MimeType[extension:'.css'].mimetype.should eq('text/css')
+      expect(M2Config::MimeType[extension:'.css'].mimetype).to eq('text/css')
     end
   
     it 'checks for doubles unless asked not to' do
@@ -43,8 +44,8 @@ describe M2Config::MimeType do
     it 'accepts an array of MIME::Types if the whole list is too much' do
       CFG.db[:mimetype].delete
       M2Config::MimeType.populate_table [MIME::Type.new(['text/plain', 'zed'])]
-      M2Config::MimeType[extension:'.zed'].mimetype.should eq('text/plain')
-      M2Config::MimeType[extension:'.css'].should eq(nil)
+      expect(M2Config::MimeType[extension:'.zed'].mimetype).to eq('text/plain')
+      expect(M2Config::MimeType[extension:'.css']).to eq(nil)
     end
   
     it 'frowns when asked to populate a non-empty table' do

data/spec/proxy_spec.rb

@@ -8,14 +8,14 @@ describe M2Config::Proxy do
     it "needs an address and a port number" do
       M2Config::Proxy.new({addr:"legacy.local", port: 8080})
       res = CFG.db[:proxy].first
-      res[:addr].should eq("legacy.local")
-      res[:port].should eq(8080)
+      expect(res[:addr]).to eq("legacy.local")
+      expect(res[:port]).to eq(8080)
     end
   end
   
   describe '#type' do
     it 'returns its type' do
-      M2Config::Proxy.new({addr:"legacy.local", port: 8080}).type.should eq("proxy")
+      expect(M2Config::Proxy.new({addr:"legacy.local", port: 8080}).type).to eq("proxy")
     end
   end
   

data/spec/route_spec.rb

@@ -7,9 +7,9 @@ describe M2Config::Route do
       dirH = M2Config::Dir.new({base: "static/"})
       M2Config::Route.new({path:"/blog", target: dirH})
       res = CFG.db[:route].first
-      res[:path].should eq("/blog")
-      res[:target_id].should eq(dirH.id)
-      res[:target_type].should eq(dirH.type)
+      expect(res[:path]).to eq("/blog")
+      expect(res[:target_id]).to eq(dirH.id)
+      expect(res[:target_type]).to eq(dirH.type)
     end
   end
   
@@ -22,9 +22,9 @@ describe M2Config::Route do
       r2 = M2Config::Route.new({path:"/king", target: dir2, host: host})
       r3 = M2Config::Route.new({path:"/king", target: dirH, host: host})
       M2Config::Route.elect!(r2)
-      host.check_routes.should be_true
+      expect(host.check_routes).to be_truthy
       king = M2Config::Route.where(path: "/king").first
-      king.target.base.should eq("ManceRayder/")
+      expect(king.target.base).to eq("ManceRayder/")
     end
 
     it "leaves routes belonging to a different host untouched" do
@@ -36,11 +36,11 @@ describe M2Config::Route do
       r2 = M2Config::Route.new({path:"/king", target: dir2, host: host})
       r3 = M2Config::Route.new({path:"/king", target: dirH, host: host2})
       M2Config::Route.elect!(r2)
-      host.check_routes.should be_true
+      expect(host.check_routes).to  be_truthy
       king = M2Config::Route.where(path: "/king").first
-      king.target.base.should eq("ManceRayder/")
+      expect(king.target.base).to eq("ManceRayder/")
       onOtherHost = M2Config::Route.where(path:"/king", target_id: dirH.id, host: host2).first
-      onOtherHost.should_not be_nil 
+      expect(onOtherHost).not_to be_nil 
     end
   end
   
@@ -51,7 +51,7 @@ describe M2Config::Route do
       r = M2Config::Route.new({path:"/blog", target: dirH})
       r.host = host.id
       res = CFG.db[:route].first
-      res[:host_id].should eq(host.id)
+      expect(res[:host_id]).to eq(host.id)
     end
     
     it "can take a Host instance" do
@@ -60,7 +60,7 @@ describe M2Config::Route do
       r = M2Config::Route.new({path:"/blog", target: dirH})
       r.host = host
       res = CFG.db[:route].first
-      res[:host_id].should eq(host.id)
+      expect(res[:host_id]).to eq(host.id)
     end
   end
   
@@ -69,7 +69,7 @@ describe M2Config::Route do
       dirH = M2Config::Dir.new({base: "static/"})
       r = M2Config::Route.new({path:"/blog", target: dirH})
       r.host = M2Config::Host.new({matching:"example.com", name: "ex"})
-      r.host.matching.should eq("example.com")
+      expect(r.host.matching).to eq("example.com")
     end
   end
 
@@ -80,8 +80,8 @@ describe M2Config::Route do
       newTarget = M2Config::Proxy.new({addr:"127.0.0.1", port: 15970})
       r.target = newTarget
       res = CFG.db[:route].first
-      res[:target_id].should eq(newTarget.id)
-      res[:target_type].should eq(newTarget.type)
+      expect(res[:target_id]).to eq(newTarget.id)
+      expect(res[:target_type]).to eq(newTarget.type)
     end
   end
   
@@ -89,7 +89,7 @@ describe M2Config::Route do
     it 'returns the Target object' do
       dirH = M2Config::Dir.new({base: "static/"})
       r = M2Config::Route.new({path:"/blog", target: dirH})
-      r.target.base.should eq dirH.base
+      expect(r.target.base).to eq dirH.base
     end
   end
 

data/spec/server_spec.rb

@@ -9,15 +9,16 @@ describe M2Config::Server do
   describe '::new' do
     it 'creates a server entry with reasonable default settings' do
       res = CFG.db[:server].first
-      res[:access_log].should eq(M2Config::Server::ACCESS_LOG)
-      res[:error_log].should eq(M2Config::Server::ERROR_LOG)
-      res[:pid_file].should eq(M2Config::Server::PID_FILE)
-      res[:control_port].should eq(M2Config::Server::CONTROL_PORT)
-      res[:chroot].should eq(M2Config::Server::CHROOT)
-      res[:default_host].should eq(M2Config::Server::DEFAULT_HOST)
-      res[:bind_addr].should eq(M2Config::Server::BIND_ADDR)
-      res[:port].should eq(M2Config::Server::PORT)
-      res[:use_ssl].should eq(M2Config::Server::USE_SSL)
+      expect(res[:access_log]).to eq(M2Config::Server::ACCESS_LOG)
+      expect(res[:error_log]).to eq(M2Config::Server::ERROR_LOG)
+      expect(res[:pid_file]).to eq(M2Config::Server::PID_FILE)
+      expect(res[:control_port]).to eq(M2Config::Server::CONTROL_PORT)
+      expect(res[:chroot]).to eq(M2Config::Server::CHROOT)
+      expect(res[:default_host]).to eq(M2Config::Server::DEFAULT_HOST)
+      expect(res[:name]).to eq(M2Config::Server::NAME)
+      expect(res[:bind_addr]).to eq(M2Config::Server::BIND_ADDR)
+      expect(res[:port]).to eq(M2Config::Server::PORT)
+      expect(res[:use_ssl]).to eq(M2Config::Server::USE_SSL)
     end
     
   end
@@ -25,7 +26,7 @@ describe M2Config::Server do
   describe '::first (from Sequel::Model)' do
     it 'returns the first server found in the database' do
       srv = M2Config::Server.first
-      srv.id.should eq(@srv.id)
+      expect(srv.id).to eq(@srv.id)
     end
   
     it 'raises if there is more than one server' do
@@ -38,7 +39,7 @@ describe M2Config::Server do
     it 'accepts an existing Host instance' do
       @srv.add_host @host
       res = CFG.db[:host].where(id: @host.id).first
-      res[:server_id].should eq(@srv.id)
+      expect(res[:server_id]).to eq(@srv.id)
     end
   end
 end

data/spec/setting_spec.rb

@@ -7,14 +7,14 @@ describe M2Config::Setting do
     it "stores the given value under the given key" do
       M2Config::Setting.new("answer",42)
       res = CFG.db[:setting].first
-      res[:value].should eq("42")
+      expect(res[:value]).to eq("42")
     end
   
     it "updates the existing value if the given key is already present" do
       M2Config::Setting.new("answer",41)
       M2Config::Setting.new("answer",42)
       res = CFG.db[:setting].first
-      res[:value].should eq("42")
+      expect(res[:value]).to eq("42")
     end
   end    
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: m2config
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Arnaud Meuret
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3