contracto 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 539e08faf6ec2176f82085c557bf154af64ef392
-  data.tar.gz: e229d835ff7227b6a154261f33bd9f8a5e108dea
+  metadata.gz: 878cd05857b9fea82b17d7a5954073fe913f0dc5
+  data.tar.gz: 9dff5a72b030781058855be8144a5ae4fde47f97
 SHA512:
-  metadata.gz: 42861847062ba686ec7bf2f1119d53bbb054b8292cc5fd79c51e203c922c4762a04c8354cebf7ba275c7dcad174a67cfd2c81870c8cd2acf7d405d1b4ac7aff8
-  data.tar.gz: 73a5d1e7bc398c71e55862cb67222872a9a158c9a43a379c2d934990abf48fda3c81be107d5a2874b836570bf66bb3057bbd17c589c190acfd083025d4136f8f
+  metadata.gz: d7a9e463e67cdc5e56c0e194f075bf0d685e3e29066d3faf5414c17ec15f97ac5da739611edaac3d09caed076428823019e4e00c7a360157a885b445a453286a
+  data.tar.gz: 33451ca2f440f3ef74e8c016e5ff3496f66a1212c1972d2811f978470e8beea887d9f20256bcf370069cb7541fe36fe37d255fcea129c96b9b61c7bd36e1c1d5

data/contracto.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'sinatra', '~> 1.4'
+  spec.add_runtime_dependency 'daemons', '~> 1.2'
 
   spec.add_development_dependency 'rspec', '~> 3.2'
   spec.add_development_dependency 'bundler', '~> 1.7'

data/lib/contracto/config.rb

@@ -1,11 +1,18 @@
 class Contracto::Config
+  extend Contracto::Constants
+
   class << self
-    def repo_url=(repo_url)
-      @repo_url = repo_url
+
+    attr_accessor :repo_url
+    attr_accessor :root_dir
+
+    def configure
+      yield self if block_given?
     end
 
-    def repo_url
-      @repo_url
+    def root_dir
+      @root_dir || default_root_dir
     end
+
   end
 end

data/lib/contracto/constants.rb

@@ -2,48 +2,28 @@ module Contracto::Constants
   require 'fileutils'
   
   GEM_DIR               = Gem::Specification.find_by_name('contracto').gem_dir
-  ROOT_DIR              = FileUtils.pwd
+  DEFAULT_ROOT_DIR      = FileUtils.pwd
   CONTRACTO_DIR         = '.contracto'
   CONTRACTO_TMP_DIR     = '.tmp.contracto'
   RUBY_SERVER_DIR       = "#{GEM_DIR}/lib/contracto/server/ruby"
-  CONTRACT_FILENAME     = 'contract.con.json'
+  CONTRACT_FILENAME     = 'contract.con.json'   # TODO: remove
   SAMPLE_CONTRACT_DIR   = "#{GEM_DIR}/spec/fixtures"
-  CONTRACT_PID_FILEPATH = "#{ROOT_DIR}/server.pid"
+  SERVER_PIDFILE_NAME   = 'server'
   PORT                  = 54321
 
-  def gem_dir
-    GEM_DIR
+  %w(
+    gem_dir
+    default_root_dir
+    contracto_dir
+    contracto_tmp_dir
+    sample_contract_dir
+    contract_filename
+    server_pidfile_name
+    port
+  ).each do |method_name|
+    define_method method_name do
+      Contracto::Constants.const_get method_name.upcase
+    end
   end
 
-  def root_dir
-    ROOT_DIR
-  end
-
-  def contracto_dir
-    CONTRACTO_DIR
-  end
-
-  def contracto_tmp_dir
-    CONTRACTO_TMP_DIR
-  end
-
-  def ruby_server_dir
-    RUBY_SERVER_DIR
-  end
-
-  def sample_contract_dir
-    SAMPLE_CONTRACT_DIR
-  end
-
-  def contract_filename
-    CONTRACT_FILENAME
-  end
-
-  def contract_pid_filepath
-    CONTRACT_PID_FILEPATH
-  end
-
-  def port
-    PORT
-  end
 end

data/lib/contracto/contract/response.rb

@@ -32,7 +32,7 @@ class Contracto::Contract::Response
   private
 
   def set_body
-    @body = File.read(root_dir + body_path)
+    @body = File.read(Contracto::Config.root_dir + body_path)
   end
 
   def replace_params_placeholders_with_params_value

data/lib/contracto/server/ruby/server.rb

@@ -1,18 +1,22 @@
-require 'sinatra'
-require 'contracto'
+require 'sinatra/base'
 
-get '/contracto' do
-  "*** Contracto server is working! [#{Gem::Specification.find_by_name('contracto').version}] ***"
-end
+class Contracto::Server < Sinatra::Base
 
-jsons_with_contracts = Dir["#{Contracto::Constants::ROOT_DIR}/**/*.con.json"].map do |file_with_contract|
-  File.read file_with_contract
-end
+  set :port, Contracto::Constants::PORT
 
-Contracto::Parser.new(jsons_with_contracts).contracts.each do |contract|
-  send(contract.http_method, contract.url_pattern) do
-    contract.response_body(params)
+  get '/contracto' do
+    "*** Contracto server is working! [#{Gem::Specification.find_by_name('contracto').version}] ***"
+  end
+
+  jsons_with_contracts = Dir["#{Contracto::Config.root_dir}/**/*.con.json"].map do |file_with_contract|
+    File.read file_with_contract
+  end
+
+  Contracto::Parser.new(jsons_with_contracts).contracts.each do |contract|
+    send(contract.http_method, contract.url_pattern) do
+      contract.response_body(params)
+    end
   end
-end
 
+end
 

data/lib/contracto/system_action.rb

@@ -21,15 +21,29 @@ class Contracto::SystemAction
     def start_server
       raise Contracto::ServerAlreadyRunningError if server_already_running?
 
-      system "rackup #{ruby_server_dir}/config.ru -p #{port} -D -P #{contract_pid_filepath}"
-      # TODO: loop below should terminate after n tries
-      system "while ! echo exit | nc localhost #{port} > /dev/null && echo \"waiting for contracto server...\"; do sleep 1; done"
-      test_request
+      require_relative 'server/ruby/server'
+      require 'daemons'
+
+      options = {
+        app_name: server_pidfile_name,
+        dir: Contracto::Config.root_dir,
+        dir_mode: :normal
+      }
+
+      Daemons.call(options) do
+        Contracto::Server.run!
+      end
+
+      5.downto(0).each do |n|
+        sleep 1
+        puts "waiting for contracto server, #{n} tries left..."
+        break if test_request(silent: true)
+      end
     end
 
     def stop_server
       puts 'killing server...'
-      Process.kill(15, File.read(contract_pid_filepath).to_i)
+      Process.kill(15, File.read("#{Contracto::Config.root_dir}/#{server_pidfile_name}.pid").to_i)
       puts '...server killed'
     rescue Errno::ENOENT
       puts 'could not kill server (pidfile not found)'
@@ -60,7 +74,7 @@ class Contracto::SystemAction
     end
 
     def contract_already_exists?
-      File.exist?("#{root_dir}/#{contract_filename}")
+      File.exist?("#{Contracto::Config.root_dir}/#{contract_filename}")
     end
 
     def server_already_running?

data/lib/contracto/version.rb

@@ -1,3 +1,3 @@
 module Contracto
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/lib/contracto.rb

@@ -8,4 +8,8 @@ module Contracto
   require_relative 'contracto/parser'
   require_relative 'contracto/system_action_chain'
   require_relative 'contracto/command'
+
+  def self.configure(&block)
+    Contracto::Config.configure(&block)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contracto
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Kacper Walanus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-11 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: daemons
+  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: rspec
   requirement: !ruby/object:Gem::Requirement