inventory-server 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74a1c94c1fee7d286ad01c8857a3f0f403dbea37
-  data.tar.gz: fac998a8d0b204d1d5eac6aab28d4c51522c1232
+  metadata.gz: 595a004bb77d3fdca856383c3d152fd56661116b
+  data.tar.gz: 94473b188763f55c6b0fc01f273081eecaa4d985
 SHA512:
-  metadata.gz: 1e4816b1f1bd5367aef0f8644cfcb8efb41244a021c8eb98e3759fd4f7a6c892f31245e99a92710ba1e78c0c151f2b91a01c1ca43b416d5203f9b72ba082065d
-  data.tar.gz: e8b49299152502b73bd08b9c2a3645fcf89336822c3ead118206a210c145c8d69bc506994a484e52f20770a04f14590ccdac73d0dd2a2ca4a77ae6ce329de383
+  metadata.gz: a7a68d033a11a1749a7aefc7e33507ca594547dc06de24e047495e3cef0a31cacff3ef1887e2ae64aaa07dc8de0bb49d45188c005eecdc8a4cb8cccd4e1c1301
+  data.tar.gz: 66c8c902a5fec61afb29d5b4d0832d8ee98176095c85a1955df0ad7e5a6de07bc8f9cebe7a131bd27a48044bd07865f4a952f0a6ff1edb121dbc185523c80f15

data/Dockerfile

@@ -1,11 +1,11 @@
 FROM      centos
 MAINTAINER Filirom1 <filirom1@gmail.com>
 
-ADD . /app
-
 RUN yum install -y epel-release
 RUN yum install -y patch tar git ruby ruby-devel rubygem-bundler make gcc gcc-c++ zlib-devel libxml2-devel nginx 
 
+ADD . /app
+
 RUN cd /app  && bundle install
 
 RUN cp /app/docker/unicorn/unicorn.conf /etc/nginx/conf.d/unicorn.conf && \
@@ -19,4 +19,5 @@ RUN mkdir -p /var/log/inventory && chmod o+rwX /var/log/inventory && \
 VOLUME ["/var/log/nginx", "/var/log/inventory"]
 
 EXPOSE 80
+WORKDIR /app
 CMD    ["/app/docker/unicorn/run-unicorn.sh"]

data/Dockerfile-passenger

@@ -1,8 +1,6 @@
 FROM      centos
 MAINTAINER Filirom1 <filirom1@gmail.com>
 
-ADD . /app
-
 RUN yum install -y epel-release
 RUN yum install -y patch tar git ruby ruby-devel rubygem-bundler make gcc gcc-c++ zlib-devel libxml2-devel httpd \
     http://puias.math.ias.edu/data/puias/unsupported/7/x86_64/mod_passenger-4.0.18-9.5.sdl7.x86_64.rpm \
@@ -10,9 +8,12 @@ RUN yum install -y patch tar git ruby ruby-devel rubygem-bundler make gcc gcc-c+
     http://puias.math.ias.edu/data/puias/unsupported/7/x86_64/rubygem-passenger-native-4.0.18-9.5.sdl7.x86_64.rpm \
     http://puias.math.ias.edu/data/puias/unsupported/7/x86_64/rubygem-passenger-native-libs-4.0.18-9.5.sdl7.x86_64.rpm
 
+ADD . /app
+
 RUN cd /app  && bundle install
 RUN cp /app/docker/passenger/passenger.conf /etc/httpd/conf.d/passenger.conf
 RUN mkdir -p /var/log/inventory && chmod o+rwX /var/log/inventory
 
 EXPOSE 80
+WORKDIR /app
 CMD    ["/app/docker/passenger/run-httpd.sh"]

data/Dockerfile-unicorn

@@ -1,11 +1,11 @@
 FROM      centos
 MAINTAINER Filirom1 <filirom1@gmail.com>
 
-ADD . /app
-
 RUN yum install -y epel-release
 RUN yum install -y patch tar git ruby ruby-devel rubygem-bundler make gcc gcc-c++ zlib-devel libxml2-devel nginx 
 
+ADD . /app
+
 RUN cd /app  && bundle install
 
 RUN cp /app/docker/unicorn/unicorn.conf /etc/nginx/conf.d/unicorn.conf && \
@@ -19,4 +19,5 @@ RUN mkdir -p /var/log/inventory && chmod o+rwX /var/log/inventory && \
 VOLUME ["/var/log/nginx", "/var/log/inventory"]
 
 EXPOSE 80
+WORKDIR /app
 CMD    ["/app/docker/unicorn/run-unicorn.sh"]

data/lib/inventory/server/config.rb

@@ -63,7 +63,7 @@ module Inventory
       def self.env()
         hash = {}
         ENV.each {|key, value|
-          next unless key.start_with? 'INVENTORY_'
+          next unless key.is_a? String and key.start_with? 'INVENTORY_'
           key = key.gsub 'INVENTORY_', ''
           key = key.downcase
           hash[key] = value

data/lib/inventory/server/http_server.rb

@@ -37,12 +37,12 @@ module Inventory
         InventoryLogger.logger.context_id = id
 
         request.body.rewind
-        settings.middlewares.call(:id => id, :body => request.body.read, :config => settings.config)
-        {:id => id, :ok => true, :status => 200}.to_json
+        result = settings.middlewares.call({ :id => id, :body => request.body.read, :config => settings.config })
+        return {:id => id}.merge!(result).to_json
       end
 
       error 400..500 do
-        {:id => env[:id], :ok => false, :status => status, :message => env['sinatra.error']}.to_json
+        {:id => env[:id], :message => env['sinatra.error']}.to_json
       end
     end
   end

data/lib/inventory/server/version.rb

@@ -1,5 +1,5 @@
 module Inventory
   module Server
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/plugins/index.rb

@@ -44,6 +44,7 @@ module Inventory
           end
         end
         @app.call(env)
+        facts
       end
 
       private

data/spec/unit/config_spec.rb

@@ -1,11 +1,17 @@
 require 'inventory/server/config'
 
 RSpec.describe Inventory::Server::Config do
-  before do
-    ENV['INVENTORY_FAILED_FACTS_DIR'] = "./log/"
-  end
-
   context "without configuration" do
+    before do
+      # remove env env configuration
+      ENV.each{|key|
+        next unless key.is_a? String and key.start_with? 'INVENTORY_'
+        ENV[key] = nil
+      }
+      # avoid mkdir exception
+      expect(FileUtils).to receive(:mkdir_p).with(any_args)
+    end
+
     it "should should use default configuration" do
       config = Inventory::Server::Config.generate({})
       expect(config[:smtp_port]).to eq 2525
@@ -13,6 +19,10 @@ RSpec.describe Inventory::Server::Config do
   end
 
   context "with etc configuration" do
+    before do
+      ENV['INVENTORY_FAILED_FACTS_DIR'] = "./log/"
+    end
+
     before(:each) do
       expect(Inventory::Server::Config).to receive(:etc).and_return({:smtp_port => 2424})
     end

data/spec/unit/http_server_spec.rb

@@ -15,6 +15,7 @@ RSpec.describe Inventory::Server::HTTPServer do
     middleware = lambda { |env|
       executed += 1
       raise 'my custom error message' if trigger_error
+      {"fact1" => 12}
     }
 
     # Proc.new is needed because Sinatra use lambda for lazy loading
@@ -33,7 +34,7 @@ RSpec.describe Inventory::Server::HTTPServer do
     it "should do the processing" do
       post '/api/v1/facts/MY_UUID', {"key" => "value"}
       expect(last_response).to be_ok
-      expect(last_response.body).to eq('{"id":"MY_UUID","ok":true,"status":200}')
+      expect(last_response.body).to eq('{"id":"MY_UUID","fact1":12}')
       expect(executed).to eq 1
     end
 
@@ -42,7 +43,7 @@ RSpec.describe Inventory::Server::HTTPServer do
       post '/api/v1/facts/MY_UUID', {"key" => "value"}
       expect(last_response).to_not be_ok
       expect(last_response.status).to eq 500
-      expect(last_response.body).to eq('{"id":"MY_UUID","ok":false,"status":500,"message":"my custom error message"}')
+      expect(last_response.body).to eq('{"id":"MY_UUID","message":"my custom error message"}')
       expect(executed).to eq 1
     end
 
@@ -51,7 +52,7 @@ RSpec.describe Inventory::Server::HTTPServer do
       post '/api/v1/facts/', {"key" => "value"}
       expect(last_response).to_not be_ok
       expect(last_response.status).to eq 404
-      expect(last_response.body).to eq('{"id":null,"ok":false,"status":404,"message":"Sinatra::NotFound"}')
+      expect(last_response.body).to eq('{"id":null,"message":"Sinatra::NotFound"}')
       expect(executed).to eq 0
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inventory-server
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Filirom1
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: midi-smtp-server