m2r 2.0.2 → 2.1.0.pre

data/kitchen/cookbooks/mongrel2/metadata.rb

@@ -0,0 +1,6 @@
+maintainer       "YOUR_COMPANY_NAME"
+maintainer_email "YOUR_EMAIL"
+license          "All rights reserved"
+description      "Installs/Configures mongrel2"
+long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version          "0.1.0"

data/kitchen/cookbooks/mongrel2/recipes/default.rb

@@ -0,0 +1,38 @@
+#
+# Cookbook Name:: mongrel2
+# Recipe:: default
+#
+# Copyright 2012, YOUR_COMPANY_NAME
+#
+# All rights reserved - Do Not Redistribute
+#
+
+%w[uuid-dev uuid-runtime libsqlite3-dev sqlite3].each do |name|
+  package name do
+    action :install
+  end
+end
+
+source = "https://github.com/zedshaw/mongrel2/tarball/v1.8.0"
+name   = "mongrel2-v1.8.0.tar.gz"
+unpack = "zedshaw-mongrel2-bc721eb"
+
+cache_dir             = Chef::Config[:file_cache_path]
+download_destination  = File.join(cache_dir, name)
+unpack_destination    = File.join(cache_dir, unpack)
+
+remote_file download_destination do
+  source source
+  mode "0644"
+  action :create_if_missing
+end
+
+execute "Extract mongrel2 archive" do
+  command "tar xvzf #{download_destination} -C #{cache_dir}"
+  creates unpack_destination
+end
+
+execute "Install mongrel2" do
+  command "cd #{unpack_destination} && make clean all && sudo make install"
+  not_if { `which m2sh | wc -l`.to_i > 0}
+end

data/kitchen/cookbooks/ruby-build/README.md

@@ -0,0 +1,12 @@
+Description
+===========
+
+Requirements
+============
+
+Attributes
+==========
+
+Usage
+=====
+

data/kitchen/cookbooks/ruby-build/definitions/ruby.rb

@@ -0,0 +1,65 @@
+define :ruby do
+  version        = params[:version]
+  home_dir       = params[:home]
+  ruby_dir       = "#{home_dir}/#{version}"
+  ruby_build_dir = "#{home_dir}/ruby-build"
+  rubygems       = params[:rubygems]
+  owner          = params[:owner]
+  bin_dir        = "#{ruby_dir}/bin"
+  ruby_bin       = "#{bin_dir}/ruby"
+  gem_bin        = "#{bin_dir}/gem"
+
+  if params[:exports]
+    hash = params[:exports].inject(node.set){|memo, step| memo[step] }
+    hash['ruby_computed'] = {
+      'ruby_dir' => ruby_dir,
+      'bin_dir'  => bin_dir,
+      'gem_bin'  => gem_bin,
+      'ruby_bin' => ruby_bin,
+    }
+  end
+
+  git ruby_build_dir do
+    repository "https://github.com/sstephenson/ruby-build.git"
+    reference "master"
+    action :sync
+    user owner
+    group owner
+  end
+
+  execute "install ruby #{ruby_dir}" do
+    command "#{ruby_build_dir}/bin/ruby-build #{version} #{ruby_dir}"
+    user owner
+    group owner
+    not_if { File.exists?(ruby_dir) }
+  end
+
+  profile_file = "#{home_dir}/.bashrc"
+  ruby_block "append ruby path #{ruby_dir}" do
+    path_definition = "export PATH=$HOME/#{version}/bin:$PATH"
+    block do
+      original_content = File.open(profile_file, 'r').read
+      File.open(profile_file, 'w') do |f|
+        f.puts "# Generated by chef"
+        f.puts path_definition
+        f.puts original_content
+      end
+    end
+    not_if { File.read(profile_file).include?(path_definition) }
+  end
+
+  if rubygems
+    execute "install rubygems - #{bin_dir}" do
+      user owner
+      cwd home_dir
+      command "#{bin_dir}/gem update --system #{rubygems}"
+      not_if %Q{test $(#{bin_dir}/gem --version) = "#{rubygems}"}
+    end
+  end
+
+  execute "#{bin_dir}/gem install bundler --no-ri --no-rdoc" do
+    user owner
+    not_if "#{bin_dir}/gem list | grep -q bundler"
+  end
+
+end

data/kitchen/cookbooks/ruby-build/metadata.json

@@ -0,0 +1,29 @@
+{
+  "name": "ruby-build",
+  "description": "Installs/Configures ruby-build",
+  "long_description": "Description\n===========\n\nRequirements\n============\n\nAttributes\n==========\n\nUsage\n=====\n\n",
+  "maintainer": "Arkency",
+  "maintainer_email": "michal.lomnicki@gmail.com",
+  "license": "All rights reserved",
+  "platforms": {
+  },
+  "dependencies": {
+  },
+  "recommendations": {
+  },
+  "suggestions": {
+  },
+  "conflicting": {
+  },
+  "providing": {
+  },
+  "replacing": {
+  },
+  "attributes": {
+  },
+  "groupings": {
+  },
+  "recipes": {
+  },
+  "version": "0.0.1"
+}

data/kitchen/cookbooks/ruby-build/metadata.rb

@@ -0,0 +1,6 @@
+maintainer       "Arkency"
+maintainer_email "michal.lomnicki@gmail.com"
+license          "All rights reserved"
+description      "Installs/Configures ruby-build"
+long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version          "0.0.1"

data/kitchen/cookbooks/ruby-build/recipes/default.rb

@@ -0,0 +1,9 @@
+package "git-core" do
+  action :install
+end
+
+%w[git-core zlib1g-dev libssl-dev libreadline-dev libxml2-dev libxslt1-dev libmysqlclient-dev].each do |name|
+  package name do
+    action :install
+  end
+end

data/kitchen/cookbooks/zmq/CHANGELOG.md

@@ -0,0 +1,12 @@
+# CHANGELOG for zmq
+
+This file is used to list changes made in each version of zmq.
+
+## 0.1.0:
+
+* Initial release of zmq
+
+- - - 
+Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown.
+
+The [Github Flavored Markdown page](http://github.github.com/github-flavored-markdown/) describes the differences between markdown on github and standard markdown.

data/kitchen/cookbooks/zmq/README.md

@@ -0,0 +1,12 @@
+Description
+===========
+
+Requirements
+============
+
+Attributes
+==========
+
+Usage
+=====
+

data/kitchen/cookbooks/zmq/metadata.json

@@ -0,0 +1,29 @@
+{
+  "name": "zmq",
+  "description": "Installs/Configures zmq",
+  "long_description": "Description\n===========\n\nRequirements\n============\n\nAttributes\n==========\n\nUsage\n=====\n\n",
+  "maintainer": "YOUR_COMPANY_NAME",
+  "maintainer_email": "YOUR_EMAIL",
+  "license": "All rights reserved",
+  "platforms": {
+  },
+  "dependencies": {
+  },
+  "recommendations": {
+  },
+  "suggestions": {
+  },
+  "conflicting": {
+  },
+  "providing": {
+  },
+  "replacing": {
+  },
+  "attributes": {
+  },
+  "groupings": {
+  },
+  "recipes": {
+  },
+  "version": "0.1.0"
+}

data/kitchen/cookbooks/zmq/metadata.rb

@@ -0,0 +1,6 @@
+maintainer       "YOUR_COMPANY_NAME"
+maintainer_email "YOUR_EMAIL"
+license          "All rights reserved"
+description      "Installs/Configures zmq"
+long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version          "0.1.0"

data/kitchen/cookbooks/zmq/recipes/default.rb

@@ -0,0 +1,36 @@
+#
+# Cookbook Name:: zmq
+# Recipe:: default
+#
+# Copyright 2012, Arkency
+#
+# All rights reserved - Do Not Redistribute
+#
+
+package 'uuid-dev'
+
+zmq     = node['zmq'] || {}
+zmq_v   = zmq['version'] || '2.2.0'
+#zmq_v   = zmq['version'] || '3.2.1-rc2'
+name    = "zeromq-#{zmq_v}.tar.gz"
+unpack  = 'zeromq-' + zmq_v.split("-").first
+
+cache_dir             = Chef::Config[:file_cache_path]
+download_destination  = File.join(cache_dir, name)
+unpack_destination    = File.join(cache_dir, unpack)
+
+remote_file download_destination do
+  source "http://download.zeromq.org/#{name}"
+  mode "0644"
+  action :create_if_missing
+end
+
+execute "Extract zmq #{zmq_v} archive" do
+  command "tar xvzf #{download_destination} -C #{cache_dir}"
+  creates unpack_destination
+end
+
+execute "Install zmq #{zmq_v} version" do
+  command "cd #{unpack_destination} && ./configure && make && sudo make install && sudo ldconfig"
+  not_if { `ldconfig -p | grep libzmq | wc -l`.to_i > 0}
+end

data/kitchen/data_bags/README

@@ -0,0 +1 @@
+

data/kitchen/data_bags/vagrant.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzI
+w+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoP
+kcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2
+hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NO
+Td0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcW
+yLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQIBIwKCAQEA4iqWPJXtzZA68mKd
+ELs4jJsdyky+ewdZeNds5tjcnHU5zUYE25K+ffJED9qUWICcLZDc81TGWjHyAqD1
+Bw7XpgUwFgeUJwUlzQurAv+/ySnxiwuaGJfhFM1CaQHzfXphgVml+fZUvnJUTvzf
+TK2Lg6EdbUE9TarUlBf/xPfuEhMSlIE5keb/Zz3/LUlRg8yDqz5w+QWVJ4utnKnK
+iqwZN0mwpwU7YSyJhlT4YV1F3n4YjLswM5wJs2oqm0jssQu/BT0tyEXNDYBLEF4A
+sClaWuSJ2kjq7KhrrYXzagqhnSei9ODYFShJu8UWVec3Ihb5ZXlzO6vdNQ1J9Xsf
+4m+2ywKBgQD6qFxx/Rv9CNN96l/4rb14HKirC2o/orApiHmHDsURs5rUKDx0f9iP
+cXN7S1uePXuJRK/5hsubaOCx3Owd2u9gD6Oq0CsMkE4CUSiJcYrMANtx54cGH7Rk
+EjFZxK8xAv1ldELEyxrFqkbE4BKd8QOt414qjvTGyAK+OLD3M2QdCQKBgQDtx8pN
+CAxR7yhHbIWT1AH66+XWN8bXq7l3RO/ukeaci98JfkbkxURZhtxV/HHuvUhnPLdX
+3TwygPBYZFNo4pzVEhzWoTtnEtrFueKxyc3+LjZpuo+mBlQ6ORtfgkr9gBVphXZG
+YEzkCD3lVdl8L4cw9BVpKrJCs1c5taGjDgdInQKBgHm/fVvv96bJxc9x1tffXAcj
+3OVdUN0UgXNCSaf/3A/phbeBQe9xS+3mpc4r6qvx+iy69mNBeNZ0xOitIjpjBo2+
+dBEjSBwLk5q5tJqHmy/jKMJL4n9ROlx93XS+njxgibTvU6Fp9w+NOFD/HvxB3Tcz
+6+jJF85D5BNAG3DBMKBjAoGBAOAxZvgsKN+JuENXsST7F89Tck2iTcQIT8g5rwWC
+P9Vt74yboe2kDT531w8+egz7nAmRBKNM751U/95P9t88EDacDI/Z2OwnuFQHCPDF
+llYOUI+SpLJ6/vURRbHSnnn8a/XG+nzedGH5JGqEJNQsz+xT2axM0/W/CRknmGaJ
+kda/AoGANWrLCz708y7VYgAtW2Uf1DPOIYMdvo6fxIB5i9ZfISgcJ/bbCUkFrhoH
++vq/5CIWxCPp0f85R4qxxQ5ihxJ0YDQT9Jpx4TMss4PSavPaBH3RXow5Ohe+bYoQ
+NE5OgEXk2wVfZczCZpigBKbKZHNYcelXtTt/nP3rsCuGcM4h53s=
+-----END RSA PRIVATE KEY-----

data/kitchen/data_bags/vagrant.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key

data/kitchen/m2r.cfg

@@ -0,0 +1,5 @@
+Host m2r.local
+  HostName 172.26.66.100
+  User vagrant
+  IdentityFile data_bags/vagrant.key
+  ForwardAgent true

data/kitchen/nodes/m2r.local.json

@@ -0,0 +1,16 @@
+{
+    "name": "m2r.local",
+    "env": "development",
+    "ipaddress": "172.26.66.100",
+    "run_list": [
+      "recipe[essential]",
+      "recipe[build-essential]",
+      "recipe[ruby-build]",
+      "recipe[zmq]",
+      "recipe[mongrel2]",
+      "recipe[m2r]"
+    ],
+    "ruby": "1.9.3-p286",
+    "username":"vagrant",
+    "home_root":"/home"
+}

data/kitchen/site-cookbooks/README

@@ -0,0 +1 @@
+

data/lib/m2r.rb

@@ -43,8 +43,10 @@ end
 Mongrel2 = M2R
 
 require 'm2r/request'
+require 'm2r/parser'
 require 'm2r/response'
 require 'm2r/reply'
 require 'm2r/connection'
 require 'm2r/connection_factory'
 require 'm2r/handler'
+require 'm2r/multithread_handler'

data/lib/m2r/connection.rb

@@ -3,7 +3,12 @@ require 'm2r'
 module M2R
   # Connection for exchanging data with mongrel2
   class Connection
-    class Error < StandardError; end
+    class Error < StandardError
+      attr_accessor :errno
+      def signal?
+        errno == ZMQ::EINTR
+      end
+    end
 
     # @param [ZMQ::Socket] request_socket socket for receiving requests
     #   from Mongrel2
@@ -30,7 +35,11 @@ module M2R
     # @api public
     def receive
       ret = @request_socket.recv_string(msg = "")
-      raise Error, "Unable to receive message: #{ZMQ::Util.error_string}" if ret < 0
+      if ret < 0
+        e = Error.new "Unable to receive message: #{ZMQ::Util.error_string}"
+        e.errno = ZMQ::Util.errno
+        raise e
+      end
       return msg
     end
 
@@ -54,11 +63,27 @@ module M2R
     # @return [String] M2 response message
     #
     # @api public
-    def deliver(uuid, connection_ids, data)
+    def deliver(uuid, connection_ids, data, trial = 1)
       msg = "#{uuid} #{TNetstring.dump([*connection_ids].join(' '))} #{data}"
-      ret = @response_socket.send_string(msg, ZMQ::NOBLOCK)
-      raise Error, "Unable to deliver message: #{ZMQ::Util.error_string}" if ret < 0
+      ret = @response_socket.send_string(msg, ZMQ::NonBlocking)
+      if ret < 0
+        e = Error.new "Unable to deliver message: #{ZMQ::Util.error_string}"
+        e.errno = ZMQ::Util.errno
+        raise e
+      end
       return msg
+    rescue Connection::Error => er
+      raise if trial >= 3
+      raise unless er.signal?
+      deliver(uuid, connection_ids, data, trial + 1)
+    end
+
+    # Closes ZMQ sockets
+    #
+    # @api public
+    def close
+      @request_socket.close
+      @response_socket.close
     end
 
     private

data/lib/m2r/handler.rb

@@ -30,6 +30,7 @@ module M2R
       catch(:stop) do
         loop { one_loop }
       end
+      @connection.close
     end
 
     # Schedule stop after processing request
@@ -127,6 +128,12 @@ module M2R
     def on_error(request, response, error)
     end
 
+    # Callback when ZMQ interrupted by signal
+    # @api public
+    # @!visibility public
+    def on_interrupted
+    end
+
     private
 
     def next_request
@@ -138,6 +145,7 @@ module M2R
       throw :stop if stop?
       response = request_lifecycle(request = next_request)
     rescue => error
+      return on_interrupted if Connection::Error === error && error.signal?
       on_error(request, response, error)
     end
 

data/lib/m2r/multithread_handler.rb

@@ -0,0 +1,27 @@
+module M2R
+  class MultithreadHandler
+
+    attr_reader :threads
+
+    def initialize(singlethread_handler_factory)
+      @singlethread_handler_factory = singlethread_handler_factory
+    end
+
+    def listen
+      @threads = 8.times.map do
+        Thread.new do
+          handler = @singlethread_handler_factory.new
+          Thread.current[:m2r_handler] = handler
+          handler.listen
+        end
+      end
+    end
+
+    def stop
+      @threads.each do |t|
+        t[:m2r_handler].stop
+      end
+    end
+
+  end
+end