warden-protocol 0.1.3 → 0.1.4

data/lib/warden/protocol/base.rb

@@ -54,7 +54,7 @@ module Warden
 
     def self.protocol_type_to_str(protocol_type)
       if protocol_type.class == Module
-        return "#{protocol_type.constants.join(", ")}"
+        return "#{protocol_type.constants.sort.join(", ")}"
       elsif protocol_type.is_a?(Symbol)
         return "#{protocol_type.to_s}"
       end

data/lib/warden/protocol/build.sh

@@ -6,8 +6,12 @@ cd $(dirname $0)/pb
 
 export BEEFCAKE_NAMESPACE=Warden::Protocol
 
-out=bundle
-(echo "package protocol;" && (find . -name '*.proto' | sort | xargs cat | sed /^package/d)) > $out
-protoc --beefcake_out=. $out
-sed -e "s/Beefcake::Message/Warden::Protocol::BaseMessage/" $out.pb.rb > ../pb.rb
-rm -f $out*
+protoc --beefcake_out=. *.proto
+
+rm ../pb.rb
+
+for generated in *.pb.rb; do
+  sed -e "s/Beefcake::Message/Warden::Protocol::BaseMessage/" $generated >> ../pb.rb
+done
+
+rm -f *.pb.rb

data/lib/warden/protocol/pb.rb

@@ -1,4 +1,4 @@
-## Generated from bundle for protocol
+## Generated from copy_in.proto for warden
 require "beefcake"
 
 module Warden
@@ -20,6 +20,13 @@ module Warden
 
 
     end
+  end
+end
+## Generated from copy_out.proto for warden
+require "beefcake"
+
+module Warden
+  module Protocol
 
     class CopyOutRequest
       include Warden::Protocol::BaseMessage
@@ -38,6 +45,13 @@ module Warden
 
 
     end
+  end
+end
+## Generated from create.proto for warden
+require "beefcake"
+
+module Warden
+  module Protocol
 
     class CreateRequest
       include Warden::Protocol::BaseMessage
@@ -72,6 +86,13 @@ module Warden
       required :handle, :string, 1
 
     end
+  end
+end
+## Generated from destroy.proto for warden
+require "beefcake"
+
+module Warden
+  module Protocol
 
     class DestroyRequest
       include Warden::Protocol::BaseMessage
@@ -87,6 +108,13 @@ module Warden
 
 
     end
+  end
+end
+## Generated from echo.proto for warden
+require "beefcake"
+
+module Warden
+  module Protocol
 
     class EchoRequest
       include Warden::Protocol::BaseMessage
@@ -103,6 +131,13 @@ module Warden
       required :message, :string, 1
 
     end
+  end
+end
+## Generated from error.proto for warden
+require "beefcake"
+
+module Warden
+  module Protocol
 
     class ErrorResponse
       include Warden::Protocol::BaseMessage
@@ -113,6 +148,13 @@ module Warden
       repeated :backtrace, :string, 3
 
     end
+  end
+end
+## Generated from info.proto for warden
+require "beefcake"
+
+module Warden
+  module Protocol
 
     class InfoRequest
       include Warden::Protocol::BaseMessage
@@ -203,6 +245,13 @@ module Warden
       repeated :job_ids, :uint64, 44
 
     end
+  end
+end
+## Generated from limit_bandwidth.proto for warden
+require "beefcake"
+
+module Warden
+  module Protocol
 
     class LimitBandwidthRequest
       include Warden::Protocol::BaseMessage
@@ -222,6 +271,37 @@ module Warden
       required :burst, :uint64, 2
 
     end
+  end
+end
+## Generated from limit_cpu.proto for warden
+require "beefcake"
+
+module Warden
+  module Protocol
+
+    class LimitCpuRequest
+      include Warden::Protocol::BaseMessage
+
+
+      required :handle, :string, 1
+      optional :limit_in_shares, :uint64, 2
+
+    end
+
+    class LimitCpuResponse
+      include Warden::Protocol::BaseMessage
+
+
+      optional :limit_in_shares, :uint64, 1
+
+    end
+  end
+end
+## Generated from limit_disk.proto for warden
+require "beefcake"
+
+module Warden
+  module Protocol
 
     class LimitDiskRequest
       include Warden::Protocol::BaseMessage
@@ -261,6 +341,13 @@ module Warden
       optional :byte_hard, :uint64, 33
 
     end
+  end
+end
+## Generated from limit_memory.proto for warden
+require "beefcake"
+
+module Warden
+  module Protocol
 
     class LimitMemoryRequest
       include Warden::Protocol::BaseMessage
@@ -278,6 +365,13 @@ module Warden
       optional :limit_in_bytes, :uint64, 1
 
     end
+  end
+end
+## Generated from link.proto for warden
+require "beefcake"
+
+module Warden
+  module Protocol
 
     class LinkRequest
       include Warden::Protocol::BaseMessage
@@ -298,6 +392,13 @@ module Warden
       optional :info, InfoResponse, 4
 
     end
+  end
+end
+## Generated from list.proto for warden
+require "beefcake"
+
+module Warden
+  module Protocol
 
     class ListRequest
       include Warden::Protocol::BaseMessage
@@ -313,6 +414,13 @@ module Warden
       repeated :handles, :string, 1
 
     end
+  end
+end
+## Generated from message.proto for warden
+require "beefcake"
+
+module Warden
+  module Protocol
 
     class Message
       include Warden::Protocol::BaseMessage
@@ -334,6 +442,7 @@ module Warden
         LimitMemory = 51
         LimitDisk = 52
         LimitBandwidth = 53
+        LimitCpu = 54
         Ping = 91
         List = 92
         Echo = 93
@@ -343,6 +452,13 @@ module Warden
       required :payload, :bytes, 2
 
     end
+  end
+end
+## Generated from net_in.proto for warden
+require "beefcake"
+
+module Warden
+  module Protocol
 
     class NetInRequest
       include Warden::Protocol::BaseMessage
@@ -362,14 +478,30 @@ module Warden
       required :container_port, :uint32, 2
 
     end
+  end
+end
+## Generated from net_out.proto for warden
+require "beefcake"
+
+module Warden
+  module Protocol
 
     class NetOutRequest
       include Warden::Protocol::BaseMessage
 
+      module Protocol
+        TCP = 0
+        UDP = 1
+        ICMP = 2
+      end
 
       required :handle, :string, 1
       optional :network, :string, 2
       optional :port, :uint32, 3
+      optional :port_range, :string, 4
+      optional :protocol, NetOutRequest::Protocol, 5
+      optional :icmp_type, :int32, 6
+      optional :icmp_code, :int32, 7
 
     end
 
@@ -379,6 +511,13 @@ module Warden
 
 
     end
+  end
+end
+## Generated from ping.proto for warden
+require "beefcake"
+
+module Warden
+  module Protocol
 
     class PingRequest
       include Warden::Protocol::BaseMessage
@@ -393,6 +532,13 @@ module Warden
 
 
     end
+  end
+end
+## Generated from resource_limits.proto for warden
+require "beefcake"
+
+module Warden
+  module Protocol
 
     class ResourceLimits
       include Warden::Protocol::BaseMessage
@@ -415,6 +561,13 @@ module Warden
       optional :stack, :uint64, 15
 
     end
+  end
+end
+## Generated from run.proto for warden
+require "beefcake"
+
+module Warden
+  module Protocol
 
     class RunRequest
       include Warden::Protocol::BaseMessage
@@ -424,6 +577,8 @@ module Warden
       required :script, :string, 2
       optional :privileged, :bool, 3, :default => false
       optional :rlimits, ResourceLimits, 4
+      optional :discard_output, :bool, 5, :default => false
+      optional :log_tag, :string, 6
 
     end
 
@@ -437,6 +592,13 @@ module Warden
       optional :info, InfoResponse, 4
 
     end
+  end
+end
+## Generated from spawn.proto for warden
+require "beefcake"
+
+module Warden
+  module Protocol
 
     class SpawnRequest
       include Warden::Protocol::BaseMessage
@@ -446,6 +608,8 @@ module Warden
       required :script, :string, 2
       optional :privileged, :bool, 3, :default => false
       optional :rlimits, ResourceLimits, 4
+      optional :discard_output, :bool, 5, :default => false
+      optional :log_tag, :string, 6
 
     end
 
@@ -456,6 +620,13 @@ module Warden
       required :job_id, :uint32, 1
 
     end
+  end
+end
+## Generated from stop.proto for warden
+require "beefcake"
+
+module Warden
+  module Protocol
 
     class StopRequest
       include Warden::Protocol::BaseMessage
@@ -473,6 +644,13 @@ module Warden
 
 
     end
+  end
+end
+## Generated from stream.proto for warden
+require "beefcake"
+
+module Warden
+  module Protocol
 
     class StreamRequest
       include Warden::Protocol::BaseMessage

data/lib/warden/protocol/pb/limit_cpu.proto

@@ -0,0 +1,32 @@
+// Limits the cpu shares for a container.
+//
+// ### Request
+//
+// The field `limit_in_shares` is optional.
+// When it is not specified, the cpu limit will not be changed.
+//
+// * `handle`: Container handle.
+// * `limit_in_shares`: New cpu limit in shares.
+//
+// ### Response
+//
+// * `limit_in_shares`: CPU limit in shares.
+//
+// ### Errors
+//
+// > **TODO**
+//
+// ### Definition
+//
+
+package warden;
+
+message LimitCpuRequest {
+  required string handle = 1;
+
+  optional uint64 limit_in_shares = 2;
+}
+
+message LimitCpuResponse {
+  optional uint64 limit_in_shares = 1;
+}

data/lib/warden/protocol/pb/link.proto

@@ -26,6 +26,8 @@
 
 package warden;
 
+import "info.proto";
+
 message LinkRequest {
   required string handle = 1;
 

data/lib/warden/protocol/pb/message.proto

@@ -25,6 +25,7 @@ message Message {
     LimitMemory    = 51;
     LimitDisk      = 52;
     LimitBandwidth = 53;
+    LimitCpu       = 54;
 
     Ping = 91;
     List = 92;

data/lib/warden/protocol/pb/net_out.proto

@@ -10,6 +10,11 @@
 // * `handle`: Container handle.
 // * `network`: Network to whitelist (in the form `1.2.3.4/8`).
 // * `port`: Port to whitelist.
+// * `port_range`: Colon separated port range (in the form `8080:9080`).
+//    Note: port_range takes precedence over port
+// * `protocol`: Network protocol (`TCP`, `UDP` or `ICMP`). Defaults to `TCP` if not set.
+// * `icmp_type`: ICMP type (use -1 to specify all ICMP types).
+// * `icmp_code`: ICMP code (use -1 to specify all ICMP codes for the given type).
 //
 // ### Response
 //
@@ -25,10 +30,19 @@
 package warden;
 
 message NetOutRequest {
-  required string handle = 1;
+  enum Protocol {
+    TCP = 0;
+    UDP = 1;
+    ICMP = 2;
+  }
+  required string handle     = 1;
 
-  optional string network = 2;
-  optional uint32 port    = 3;
+  optional string network    = 2;
+  optional uint32 port       = 3;
+  optional string port_range = 4;
+  optional Protocol protocol = 5;
+  optional int32 icmp_type   = 6;
+  optional int32 icmp_code   = 7;
 }
 
 message NetOutResponse {

data/lib/warden/protocol/pb/run.proto

@@ -13,12 +13,19 @@
 
 package warden;
 
+import "resource_limits.proto";
+import "info.proto";
+
 message RunRequest {
   required string handle = 1;
 
   required string script = 2;
   optional bool privileged = 3 [default = false];
   optional ResourceLimits rlimits = 4;
+
+  optional bool discard_output = 5 [default = false];
+
+  optional string log_tag = 6;
 }
 
 message RunResponse {

data/lib/warden/protocol/pb/spawn.proto

@@ -24,12 +24,18 @@
 
 package warden;
 
+import "resource_limits.proto";
+
 message SpawnRequest {
   required string handle = 1;
 
   required string script = 2;
   optional bool privileged = 3 [default = false];
   optional ResourceLimits rlimits = 4;
+
+  optional bool discard_output = 5 [default = false];
+
+  optional string log_tag = 6;
 }
 
 message SpawnResponse {

data/lib/warden/protocol/pb/stream.proto

@@ -27,6 +27,8 @@
 
 package warden;
 
+import "info.proto";
+
 message StreamRequest {
   required string handle = 1;
 

data/lib/warden/protocol/version.rb

@@ -2,6 +2,6 @@
 
 module Warden
   module Protocol
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

data/spec/base_spec.rb

@@ -89,8 +89,8 @@ end
 describe Warden::Protocol do
   before :all do
     module Test
-      A = 1
       B = 2
+      A = 1
     end
   end
 

data/spec/buffer_spec.rb

@@ -7,6 +7,8 @@ describe Warden::Protocol::Buffer do
   let(:request) { Warden::Protocol::EchoRequest.new(:message => "request") }
   let(:response) { Warden::Protocol::EchoResponse.new(:message => "response") }
 
+  subject { described_class.new }
+
   it "should support iterating over requests" do
     subject << Warden::Protocol::Buffer.request_to_wire(request)
     subject.each_request do |request|
@@ -28,7 +30,7 @@ describe Warden::Protocol::Buffer do
       data = Warden::Protocol::Buffer.request_to_wire(request)
 
       loop do
-        chunk = data.slice!(0)
+        chunk = data.slice!(0).chr
         subject << chunk
         break if data.empty?
 
@@ -47,7 +49,7 @@ describe Warden::Protocol::Buffer do
       data = Warden::Protocol::Buffer.response_to_wire(response)
 
       loop do
-        chunk = data.slice!(0)
+        chunk = data.slice!(0).chr
         subject << chunk
         break if data.empty?
 

data/spec/copy_in_spec.rb

@@ -7,7 +7,7 @@ describe Warden::Protocol::CopyInRequest do
     described_class.new(
       :handle => "handle",
       :src_path => "/src",
-      :dst_path => "/dst",
+      :dst_path => "/dst"
     )
   end
 

data/spec/copy_out_spec.rb

@@ -7,7 +7,7 @@ describe Warden::Protocol::CopyOutRequest do
     described_class.new(
       :handle => "handle",
       :src_path => "/src",
-      :dst_path => "/dst",
+      :dst_path => "/dst"
     )
   end
 

data/spec/limit_cpu_spec.rb

@@ -0,0 +1,47 @@
+# coding: UTF-8
+
+require "spec_helper"
+
+describe Warden::Protocol::LimitCpuRequest do
+  subject(:request) do
+    described_class.new(:handle => "handle")
+  end
+
+  it_should_behave_like "wrappable request"
+
+  its("class.type_camelized") { should == "LimitCpu" }
+  its("class.type_underscored") { should == "limit_cpu" }
+
+  field :handle do
+    it_should_be_required
+    it_should_be_typed_as_string
+  end
+
+  field :limit_in_shares do
+    it_should_be_optional
+    it_should_be_typed_as_uint64
+  end
+
+  it "should respond to #create_response" do
+    request.create_response.should be_a(Warden::Protocol::LimitCpuResponse)
+  end
+end
+
+describe Warden::Protocol::LimitCpuResponse do
+  subject(:response) do
+    described_class.new
+  end
+
+  it_should_behave_like "wrappable response"
+
+  its("class.type_camelized") { should == "LimitCpu" }
+  its("class.type_underscored") { should == "limit_cpu" }
+
+  it { should be_ok }
+  it { should_not be_error }
+
+  field :limit_in_shares do
+    it_should_be_optional
+    it_should_be_typed_as_uint64
+  end
+end

data/spec/run_spec.rb

@@ -26,6 +26,16 @@ module Warden::Protocol
       it_should_default_to false
     end
 
+    field :discard_output do
+      it_should_be_optional
+      it_should_default_to false
+    end
+
+    field :log_tag do
+      it_should_be_optional
+      it_should_default_to nil
+    end
+
     field :rlimits do
       it_should_be_optional
 

data/spec/spawn_spec.rb

@@ -25,6 +25,16 @@ describe Warden::Protocol::SpawnRequest do
     it_should_default_to false
   end
 
+  field :discard_output do
+    it_should_be_optional
+    it_should_default_to false
+  end
+
+  field :log_tag do
+    it_should_be_optional
+    it_should_default_to nil
+  end
+
   it "should be populated with ResourceLimits object" do
     request.rlimits = Warden::Protocol::ResourceLimits.new
     request.should be_valid

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: warden-protocol
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: 2.11.0
 description: Protocol specification for Warden
 email:
 - pcnoordhuis@gmail.com
@@ -50,18 +50,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- CHANGELOG.md
-- Gemfile
-- README.md
-- Rakefile
-- lib/warden/protocol.rb
 - lib/warden/protocol/base.rb
 - lib/warden/protocol/buffer.rb
 - lib/warden/protocol/build.sh
 - lib/warden/protocol/message.rb
-- lib/warden/protocol/pb.rb
 - lib/warden/protocol/pb/copy_in.proto
 - lib/warden/protocol/pb/copy_out.proto
 - lib/warden/protocol/pb/create.proto
@@ -70,6 +62,7 @@ files:
 - lib/warden/protocol/pb/error.proto
 - lib/warden/protocol/pb/info.proto
 - lib/warden/protocol/pb/limit_bandwidth.proto
+- lib/warden/protocol/pb/limit_cpu.proto
 - lib/warden/protocol/pb/limit_disk.proto
 - lib/warden/protocol/pb/limit_memory.proto
 - lib/warden/protocol/pb/link.proto
@@ -83,7 +76,9 @@ files:
 - lib/warden/protocol/pb/spawn.proto
 - lib/warden/protocol/pb/stop.proto
 - lib/warden/protocol/pb/stream.proto
+- lib/warden/protocol/pb.rb
 - lib/warden/protocol/version.rb
+- lib/warden/protocol.rb
 - spec/base_spec.rb
 - spec/buffer_spec.rb
 - spec/copy_in_spec.rb
@@ -94,6 +89,7 @@ files:
 - spec/error_spec.rb
 - spec/info_spec.rb
 - spec/limit_bandwidth_spec.rb
+- spec/limit_cpu_spec.rb
 - spec/limit_disk_spec.rb
 - spec/limit_memory_spec.rb
 - spec/link_spec.rb
@@ -111,7 +107,6 @@ files:
 - spec/support/examples/wrappable_request.rb
 - spec/support/helper.rb
 - spec/support/matchers.rb
-- warden-protocol.gemspec
 homepage: ''
 licenses: []
 post_install_message: 
@@ -132,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: Protocol specification for Warden
@@ -147,6 +142,7 @@ test_files:
 - spec/error_spec.rb
 - spec/info_spec.rb
 - spec/limit_bandwidth_spec.rb
+- spec/limit_cpu_spec.rb
 - spec/limit_disk_spec.rb
 - spec/limit_memory_spec.rb
 - spec/link_spec.rb

data/.gitignore

@@ -1,17 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/.rspec

@@ -1 +0,0 @@
---fail-fast --backtrace --color

data/CHANGELOG.md

@@ -1,14 +0,0 @@
-## 0.0.3
-
-* Ignore string encoding when a request or response is encoded
-
-## 0.0.2
-
-### `StopRequest`
-
-* Added `background` flag
-* Added `kill` flag
-
-## 0.0.1
-
-* Initial version.

data/Gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in warden-protocol.gemspec
-gemspec
-
-gem 'rake'

data/README.md

@@ -1,13 +0,0 @@
-# warden-protocol
-
-> This README describes the **protocol** library. Please refer to the top
-> level [README][tlr] for an overview of all components.
-
-[tlr]: /README.md
-
-## License
-
-The project is licensed under the Apache 2.0 license (see the
-[`LICENSE`][license] file in the root directory of the repository).
-
-[license]: /LICENSE

data/Rakefile

@@ -1,40 +0,0 @@
-# coding: UTF-8
-
-require "rspec/core/rake_task"
-require "rspec/core/version"
-
-task :default => :spec
-
-desc "Run all examples"
-RSpec::Core::RakeTask.new(:spec) do |t|
-  # See .rspec
-end
-
-desc "Build pb.rb"
-task :build do
-  sh("lib/warden/protocol/build.sh")
-end
-
-task :ensure_coding do
-  patterns = [
-    /Rakefile$/,
-    /\.rb$/,
-  ]
-
-  files = `git ls-files`.split.select do |file|
-    patterns.any? { |e| e.match(file) }
-  end
-
-  header = "# coding: UTF-8\n\n"
-
-  files.each do |file|
-    content = File.read(file)
-
-    unless content.start_with?(header)
-      File.open(file, "w") do |f|
-        f.write(header)
-        f.write(content)
-      end
-    end
-  end
-end

data/warden-protocol.gemspec

@@ -1,21 +0,0 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/warden/protocol/version', __FILE__)
-
-Gem::Specification.new do |gem|
-  gem.authors       = ["Pieter Noordhuis"]
-  gem.email         = ["pcnoordhuis@gmail.com"]
-  gem.description   = %q{Protocol specification for Warden}
-  gem.summary       = %q{Protocol specification for Warden}
-  gem.homepage      = ""
-
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "warden-protocol"
-  gem.require_paths = ["lib"]
-  gem.version       = Warden::Protocol::VERSION
-
-  gem.add_dependency "beefcake"
-
-  gem.add_development_dependency "rspec", "~> 2.11"
-end