kamerling 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9be4e3ac2863218c3d390f4afb2e80f8da0c93be
-  data.tar.gz: 98c18518041d91d383daa9c79c5bd46999de4b75
+  metadata.gz: 7e6dbf946f5fa033f8c544564030c65e230ac10c
+  data.tar.gz: 8dd41ffe1684f4ec003a63fed7e8058bfdc8dc88
 SHA512:
-  metadata.gz: e1b0aeb3ea6a079fd8999f326e6800edcc9f6b56ad1ab0ed997fbf71223e571ae44a7e8c02dc0f5d7d11c65e4dc98b0eae55be57e532bfd90a8d9e61030a56b6
-  data.tar.gz: ffe10141b36930b5bf9b4b904312ca96e62e652b51b35f1fceab122fabd7a77258cd9a137936ce6af9c48fefc5968784f189c619cb3685c53091fea66fabcde0
+  metadata.gz: 2c6994c506f7bc2af1b96ac2e3f74cb2fdafe08b7efb1a46c10340c6bdc1829bcb1151b4898be5094ad9d00cf07955b0fc1fa3136b0acdea727c10871e3a3377
+  data.tar.gz: 30e1fd388e616fab264f7d4d56652f093638cf88601b68cedf65158a888cafcb81e45da173c13775e33770959cde970c0b5e249b1a5551278e5e3291efd7b0b0

data/.rubocop.yml

@@ -1,5 +1,6 @@
-AccessModifierIndentation:
-  Enabled: false
+AllCops:
+  Exclude:
+    - tmp/**/*
 
 AndOr:
   Enabled: false
@@ -7,18 +8,8 @@ AndOr:
 Documentation:
   Enabled: false
 
-EndAlignment:
+SingleSpaceBeforeFirstArg:
   Enabled: false
 
-HandleExceptions:
-  Exclude:
-    - lib/kamerling/server/sock.rb
-
-IndentationWidth:
-  Enabled: false
-
-MethodDefParentheses:
-  EnforcedStyle: require_no_parentheses
-
 TrailingComma:
   EnforcedStyleForMultiline: comma

data/Gemfile

@@ -1,3 +1,2 @@
 source 'https://rubygems.org'
 gemspec
-gem 'virtus', github: 'solnic/virtus'

data/Gemfile.lock

@@ -1,18 +1,9 @@
-GIT
-  remote: git://github.com/solnic/virtus.git
-  revision: c31940a63d1a4a2ac30032a0c01a9a217b5f5f82
-  specs:
-    virtus (1.0.2)
-      axiom-types (~> 0.1)
-      coercible (~> 1.0)
-      descendants_tracker (~> 0.0.3)
-      equalizer (~> 0.0.9)
-
 PATH
   remote: .
   specs:
-    kamerling (0.0.2)
+    kamerling (0.0.3)
       after_do (~> 0.3.0)
+      equalizer (~> 0.0.9)
       sequel (~> 4.4)
       sinatra (~> 1.4)
       slim (~> 2.0)
@@ -22,88 +13,97 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    after_do (0.3.0)
-    ast (1.1.0)
-    atomic (1.1.16)
-    axiom-types (0.1.0)
-      descendants_tracker (~> 0.0.3)
+    after_do (0.3.1)
+    ast (2.0.0)
+    astrolabe (1.3.0)
+      parser (>= 2.2.0.pre.3, < 3.0)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
-      thread_safe (~> 0.1.3)
-    bogus (0.1.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    bogus (0.1.5)
       dependor (>= 0.0.4)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    celluloid-io (0.15.0)
-      celluloid (>= 0.15.0)
-      nio4r (>= 0.5.0)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    coderay (1.1.0)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     dependor (1.0.1)
-    descendants_tracker (0.0.3)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     equalizer (0.0.9)
-    ffi (1.9.3)
+    ffi (1.9.6)
+    hitimes (1.2.2)
     ice_nine (0.11.0)
-    json (1.8.1)
-    listen (2.7.1)
+    listen (2.7.11)
       celluloid (>= 0.15.2)
-      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    mini_portile (0.5.2)
-    minitest (5.3.1)
+    method_source (0.8.2)
+    mini_portile (0.6.1)
+    minitest (5.4.2)
     minitest-focus (1.1.0)
       minitest (>= 4, < 6)
-    nio4r (1.0.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    parser (2.1.7)
-      ast (~> 1.1)
+    nokogiri (1.6.4.1)
+      mini_portile (~> 0.6.0)
+    parser (2.2.0.pre.7)
+      ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
     powerpack (0.0.9)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     rack (1.5.2)
-    rack-protection (1.5.2)
+    rack-protection (1.5.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
     rainbow (2.0.0)
-    rake (10.1.1)
+    rake (10.3.2)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.3)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    reek (1.3.6)
-      ruby2ruby (~> 2.0.7)
-      ruby_parser (~> 3.2)
-      sexp_processor
-    rerun (0.9.0)
-      listen (~> 2.7)
-    rubocop (0.19.1)
-      json (>= 1.7.7, < 2)
-      parser (~> 2.1.7)
+    reek (1.4.0)
+      rainbow (>= 1.99, < 3.0)
+      ruby2ruby (>= 2.0.8, < 3.0)
+      ruby_parser (>= 3.5.0, < 4.0)
+      sexp_processor (~> 4.4)
+    rerun (0.10.0)
+      listen (~> 2.7, >= 2.7.3)
+    rubocop (0.27.1)
+      astrolabe (~> 1.3)
+      parser (>= 2.2.0.pre.7, < 3.0)
       powerpack (~> 0.0.6)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.4.2)
-    ruby2ruby (2.0.7)
+    ruby-progressbar (1.7.0)
+    ruby2ruby (2.1.3)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)
-    ruby_parser (3.4.1)
+    ruby_parser (3.6.3)
       sexp_processor (~> 4.1)
-    sequel (4.8.0)
-    sexp_processor (4.4.2)
-    sinatra (1.4.4)
+    sequel (4.16.0)
+    sexp_processor (4.4.4)
+    sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    slim (2.0.2)
-      temple (~> 0.6.6)
+    slim (2.1.0)
+      temple (~> 0.6.9)
       tilt (>= 1.3.3, < 2.1)
-    slop (3.5.0)
-    sqlite3 (1.3.9)
-    temple (0.6.7)
-    thread_safe (0.1.3)
-      atomic
+    slop (3.6.0)
+    sqlite3 (1.3.10)
+    temple (0.6.10)
+    thread_safe (0.3.4)
     tilt (1.4.1)
-    timers (1.1.0)
+    timers (4.0.1)
+      hitimes
+    virtus (1.0.3)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
 
 PLATFORMS
   ruby
@@ -114,9 +114,9 @@ DEPENDENCIES
   minitest (~> 5.0)
   minitest-focus (~> 1.1)
   nokogiri (~> 1.6)
+  pry (~> 0.10.0)
   rack-test (~> 0.6.2)
   rake (~> 10.1)
   reek (~> 1.3)
-  rerun (~> 0.9.0)
-  rubocop (~> 0.19.0)
-  virtus!
+  rerun (~> 0.10.0)
+  rubocop (~> 0.27.0)

data/README.md

@@ -3,4 +3,21 @@ Kamerling
 
 Kamerling is a lightweight server for managing a network of computation clients.
 
-© MMXIII Piotr Szotkowski <p.szotkowski@tele.pw.edu.pl>, licensed under AGPL 3 (see LICENCE)
+HTTP API
+--------
+
+Minimal docs on the HTTP API (which happens to use XHTML and so should be mostly usable through a browser):
+
+`GET /` returns links to clients (at `#clients [href]`) and project (at `#projects [href]`).
+
+`GET /clients` contains information on and links to clients (at `#clients [data-class=client]`).
+
+`GET /projects` contains links to projects (at `#projects [data-class=project]`).
+
+`GET /projects/{uuid}` contains client (at `#clients [data-class=client]` and task (at `#tasks [data-class=task]`) information on a given project.
+
+`POST /projects` creates a new project (given a `name` and an `uuid`).
+
+`POST /projects/dispatch` dispatches tasks to all free clients.
+
+© MMXIII-MMXIV Piotr Szotkowski <p.szotkowski@tele.pw.edu.pl>, licensed under AGPL 3 (see LICENCE)

data/Rakefile

@@ -2,9 +2,9 @@ require 'rake/testtask'
 require 'reek/rake/task'
 require 'rubocop/rake_task'
 
-task default: %i[spec rubocop reek]
+task default: %i(spec rubocop reek)
 
-Rake::TestTask.new :spec do |task|
+Rake::TestTask.new(:spec) do |task|
   task.test_files = FileList['spec/**/*_spec.rb']
   task.warning    = true
 end
@@ -15,4 +15,6 @@ Reek::Rake::Task.new do |task|
   task.reek_opts     = '--quiet'
 end
 
-Rubocop::RakeTask.new
+RuboCop::RakeTask.new do |task|
+  task.options << '--display-cop-names'
+end

data/bin/kamerling

@@ -4,6 +4,6 @@ require_relative '../lib/kamerling'
 
 Thread.abort_on_exception = true
 
-Kamerling::Logging.log_to Logger.new $stdout
+Kamerling::Logging.log_to Logger.new($stdout)
 
 Kamerling::ServerRunner.new(ARGV).start.join

data/config/reek.yml

@@ -1,7 +1,17 @@
 DuplicateMethodCall:
   exclude:
-  - Kamerling#self.class_definition_from
-  - Kamerling::Handler#handle
+    - Kamerling::Handler#handle
+    - Kamerling::Handler#process
+    - Kamerling::Logging#log_dispatcher
+    - Kamerling::Logging#log_server
+    - Kamerling::Mapper#to_h
+    - Kamerling::TaskDispatcher#dispatch_task
+
+FeatureEnvy:
+  exclude:
+    # https://github.com/troessner/reek/issues/53
+    - Kamerling::NetDispatcher
+    - Kamerling::UUID
 
 IrresponsibleModule:
   enabled: false
@@ -11,4 +21,11 @@ NestedIterators:
 
 UnusedParameters:
   exclude:
-  - Kamerling::Server::HTTP#initialize
+    - Kamerling::Server::HTTP#initialize
+
+UtilityFunction:
+  exclude:
+    # https://github.com/troessner/reek/issues/27
+    - Kamerling::Mapper
+    - Kamerling::NetDispatcher
+    - Kamerling::UUID

data/kamerling.gemspec

@@ -1,31 +1,34 @@
 Gem::Specification.new do |gem|
   gem.author      = 'Piotr Szotkowski'
-  gem.description = 'A network server for distributing computations across different clients speaking TCP or UDP.'
+  gem.description = 'A network server for distributing computations across ' \
+                    'different clients speaking TCP or UDP.'
   gem.email       = 'p.szotkowski@tele.pw.edu.pl'
   gem.homepage    = 'https://github.com/chastell/kamerling'
   gem.license     = 'AGPL-3.0'
   gem.name        = 'kamerling'
   gem.summary     = 'Kamerling: a computation network server'
-  gem.version     = '0.0.2'
+  gem.version     = '0.0.3'
 
-  gem.files       = `git ls-files -z`.split "\0"
-  gem.executables = gem.files.grep(%r{^bin/}).map { |path| File.basename path }
-  gem.test_files  = gem.files.grep %r{^spec/.*\.rb$}
+  gem.files       = `git ls-files -z`.split("\0")
+  gem.executables = gem.files.grep(/^bin\//).map { |path| File.basename(path) }
+  gem.test_files  = gem.files.grep(/^spec\/.*\.rb$/)
 
-  gem.add_dependency 'after_do', '~> 0.3.0'
-  gem.add_dependency 'sequel',   '~> 4.4'
-  gem.add_dependency 'sinatra',  '~> 1.4'
-  gem.add_dependency 'slim',     '~> 2.0'
-  gem.add_dependency 'sqlite3',  '~> 1.3'
-  gem.add_dependency 'virtus',   '~> 1.0'
+  gem.add_dependency 'after_do',  '~> 0.3.0'
+  gem.add_dependency 'equalizer', '~> 0.0.9'
+  gem.add_dependency 'sequel',    '~> 4.4'
+  gem.add_dependency 'sinatra',   '~> 1.4'
+  gem.add_dependency 'slim',      '~> 2.0'
+  gem.add_dependency 'sqlite3',   '~> 1.3'
+  gem.add_dependency 'virtus',    '~> 1.0'
 
   gem.add_development_dependency 'bogus',          '~> 0.1.3'
   gem.add_development_dependency 'minitest',       '~> 5.0'
   gem.add_development_dependency 'minitest-focus', '~> 1.1'
   gem.add_development_dependency 'nokogiri',       '~> 1.6'
+  gem.add_development_dependency 'pry',            '~> 0.10.0'
   gem.add_development_dependency 'rack-test',      '~> 0.6.2'
   gem.add_development_dependency 'rake',           '~> 10.1'
   gem.add_development_dependency 'reek',           '~> 1.3'
-  gem.add_development_dependency 'rerun',          '~> 0.9.0'
-  gem.add_development_dependency 'rubocop',        '~> 0.19.0'
+  gem.add_development_dependency 'rerun',          '~> 0.10.0'
+  gem.add_development_dependency 'rubocop',        '~> 0.27.0'
 end

data/lib/kamerling.rb

@@ -1,29 +1,3 @@
-require 'socket'
-
-require_relative 'kamerling/core_extensions'
-
-include Kamerling::CoreExtensions::Main
-
-require_relative 'kamerling/addr'
-require_relative 'kamerling/handler'
-require_relative 'kamerling/message'
-require_relative 'kamerling/net_dispatcher'
-require_relative 'kamerling/receiver'
-require_relative 'kamerling/registrar'
-require_relative 'kamerling/repo'
-require_relative 'kamerling/repos'
-require_relative 'kamerling/http_api'
-require_relative 'kamerling/server/http'
-require_relative 'kamerling/server/sock'
-require_relative 'kamerling/server/tcp'
-require_relative 'kamerling/server/udp'
-require_relative 'kamerling/server_runner'
-require_relative 'kamerling/task_dispatcher'
-require_relative 'kamerling/uuid'
-require_relative 'kamerling/uuid_entity'
-require_relative 'kamerling/client'
-require_relative 'kamerling/project'
-require_relative 'kamerling/registration'
-require_relative 'kamerling/task'
-require_relative 'kamerling/result'
+require_relative 'kamerling/core_extensions/main'
 require_relative 'kamerling/logging'
+require_relative 'kamerling/server_runner'

data/lib/kamerling/addr.rb

@@ -1,5 +1,15 @@
+require 'socket'
+require 'uri'
+require_relative 'value'
+
 module Kamerling
-  Addr = Struct.new :host, :port, :prot do
+  class Addr < Value
+    vals host: String, port: Integer, prot: Symbol
+
+    def self.[](host, port, prot)
+      new(host: host, port: port, prot: prot)
+    end
+
     def connectable?
       TCPSocket.open(*self).close
       true
@@ -12,11 +22,15 @@ module Kamerling
     end
 
     def to_h
-      super.merge prot: prot.to_s
+      attributes.merge(prot: prot.to_s)
     end
 
     def to_s
-      "#{host}:#{port} (#{prot})"
+      uri.to_s
+    end
+
+    def uri
+      URI.parse("#{prot.downcase}://#{host}:#{port}")
     end
   end
 end

data/lib/kamerling/client.rb

@@ -1,14 +1,13 @@
-module Kamerling class Client < UUIDEntity
-  attribute :addr, Addr
-  attribute :busy, Boolean, default: false
+require_relative 'addr'
+require_relative 'uuid_entity'
 
-  def self.from_h hash
-    super.tap do |client|
-      client.addr = Addr[hash[:host], hash[:port], hash[:prot]]
-    end
-  end
+module Kamerling
+  class Client < UUIDEntity
+    attrs addr: Addr, busy: Boolean, type: Symbol
+    defaults busy: false
 
-  def to_h
-    super.reject { |key, _| key == :addr }.merge addr.to_h
+    def to_h
+      attributes.merge(type: type.to_s)
+    end
   end
-end end
+end