evrone-ci-message 0.0.4 → 0.2.0.pre0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d81d29bc5c462f047767d8bb63970aa18aa1a9b
-  data.tar.gz: 52557b06f73bbd5955f1789a111315c00a6a25b9
+  metadata.gz: 60eef0c25c034d6716080e56c3192b5b34c5fc39
+  data.tar.gz: d8cdb657b4fe838c25015a53b583d870a579267f
 SHA512:
-  metadata.gz: 892a623fd87785a0ab03e0e604c2e0cf834105eed61e98b4dbcbbc2f95cebdcd29bb8da08c40608322f19e8538984130df2e8e2e819b4186458d358d93fbce63
-  data.tar.gz: 06a1c5d3c5dc901786b044d4188841a64cf37a55255ba4338cf8933aed588477268b5d19324808226bf90d554bb8fad6bd665917a426cc7b8e5729bfd37ec53f
+  metadata.gz: b6fd495099b219fbac1f82a8e3f5a61dc1ce20a91129ca99766e32e4ca6f0ea8cdf00b621ffe2fdc2094c440d7d4a5ad4445eaa6fac0d45cbc8b286af1e0e731
+  data.tar.gz: 22c9c67b11da735af8a624894cba9d471523dffad14398ab953bd877f53f3584b08a117d7e5afd7cde22e1fe268830b6a875fa4722897924b90b6f232c024fe4

data/Rakefile

@@ -1 +1,14 @@
+require 'rubygems'
+require 'bundler'
+Bundler.require
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :gen do
+  system %{ env BEEFCAKE_NAMESPACE="Evrone::CI::Message" protoc proto/messages.proto --beefcake_out lib/evrone/ci/message/ }
+end
+
+task :default => [:gen, :spec]
+task :travis => :default

data/evrone-ci-message.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'ruby-protocol-buffers', '~> 1.4'
+  spec.add_runtime_dependency 'beefcake', '= 0.3.7'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/evrone/ci/message.rb

@@ -1,122 +1,10 @@
 require File.expand_path("../message/version", __FILE__)
-require 'protocol_buffers'
-require 'stringio'
+require File.expand_path("../message/messages.pb.rb", __FILE__)
 
 module Evrone
   module CI
     module Message
 
-      module Serializable
-        def to_serialized_string
-          StringIO.open do |io|
-            serialize(io)
-            io.rewind
-            io.read
-          end
-        end
-      end
-
-      class PerformBuild < ProtocolBuffers::Message
-
-        include Serializable
-
-        required :uint64,  :id,              1
-        required :string,  :name,            2
-        required :string,  :src,             3
-        required :string,  :sha,             4
-        optional :uint64,  :pull_request_id, 5
-        optional :string,  :deploy_key,      6
-
-      end
-
-      class PerformJob < ProtocolBuffers::Message
-
-        include Serializable
-
-        required :uint64,  :id,              1
-        required :string,  :name,            2
-        required :string,  :src,             3
-        required :string,  :sha,             4
-        optional :uint64,  :pull_request_id, 5
-        optional :string,  :deploy_key,      6
-
-        required :uint64,  :job_id,          7
-
-        required :string,  :before_script,   8
-        required :string,  :script,          9
-
-        repeated :string,  :matrix_keys,     10
-      end
-
-      class BuildLog < ProtocolBuffers::Message
-
-        include Serializable
-
-        required :uint64,  :build_id,        1
-        required :string,  :log,             2
-        required :uint64,  :tm,              3
-        required :uint32,  :tm_usec,         4
-
-      end
-
-      class JobLog < ProtocolBuffers::Message
-
-        include Serializable
-
-        required :uint64,  :build_id,        1
-        required :string,  :log,             2
-        required :uint64,  :tm,              3
-        required :uint32,  :tm_usec,         4
-        required :uint64,  :job_id,          5
-
-      end
-
-      module Status
-
-        include ProtocolBuffers::Enum
-
-        Pending  = 0
-        Prepared = 1
-        Started  = 2
-        Finished = 3
-        Broken   = 4
-        Failed   = 5
-
-      end
-
-      class BuildStatus < ProtocolBuffers::Message
-
-        include Serializable
-
-        required :uint64,  :build_id,        1
-        required Status,   :status,          2
-        required :uint64,  :tm,              3
-        required :uint32,  :tm_usec,         4
-
-        required :uint32,  :jobs_count,      5
-        repeated :string,  :matrix,          6
-
-        optional :string,  :commit_author,   7
-        optional :string,  :commit_author_email,   8
-        optional :string,  :commit_sha,      9
-        optional :string,  :commit_message,  10
-
-      end
-
-      class JobStatus < BuildStatus
-
-        include Serializable
-
-        required :uint64,  :build_id,        1
-        required :uint64,  :job_id,          2
-        required Status,   :status,          3
-        required :uint64,  :tm,              4
-        required :uint32,  :tm_usec,         5
-
-        repeated :string,  :matrix,          6
-
-      end
-
     end
   end
 end

data/lib/evrone/ci/message/messages.pb.rb

@@ -0,0 +1,106 @@
+## Generated from proto/messages.proto for evrone.ci.message
+require "beefcake"
+
+module Evrone
+  module CI
+    module Message
+
+      class PerformBuild
+        include Beefcake::Message
+
+
+        required :id, :uint64, 1
+        required :name, :string, 2
+        required :src, :string, 3
+        required :sha, :string, 4
+        optional :pull_request_id, :uint64, 5
+        optional :deploy_key, :string, 6
+
+      end
+
+      class PerformJob
+        include Beefcake::Message
+
+
+        required :id, :uint64, 1
+        required :name, :string, 2
+        required :src, :string, 3
+        required :sha, :string, 4
+        optional :pull_request_id, :uint64, 5
+        optional :deploy_key, :string, 6
+        required :job_id, :uint64, 7
+        required :before_script, :string, 8
+        required :script, :string, 9
+        repeated :matrix_keys, :string, 10
+
+      end
+
+      class BuildLog
+        include Beefcake::Message
+
+
+        required :build_id, :uint64, 1
+        required :log, :string, 2
+        required :tm, :uint64, 3
+        required :tm_usec, :uint32, 4
+
+      end
+
+      class JobLog
+        include Beefcake::Message
+
+
+        required :build_id, :uint64, 1
+        required :log, :string, 2
+        required :tm, :uint64, 3
+        required :tm_usec, :uint32, 4
+        required :job_id, :uint64, 5
+
+      end
+
+      class BuildStatus
+        include Beefcake::Message
+
+        module Status
+          PENDING = 0
+          STARTED = 2
+          FINISHED = 3
+          BROKEN = 4
+          FAILED = 5
+        end
+
+        required :build_id, :uint64, 1
+        required :status, BuildStatus::Status, 2
+        required :tm, :uint64, 3
+        required :tm_usec, :uint32, 4
+        required :jobs_count, :uint32, 5
+        repeated :matrix, :string, 6
+        optional :commit_author, :string, 7
+        optional :commit_author_email, :string, 8
+        optional :commit_sha, :string, 9
+        optional :commit_message, :string, 10
+
+      end
+
+      class JobStatus
+        include Beefcake::Message
+
+        module Status
+          PENDING = 0
+          STARTED = 2
+          FINISHED = 3
+          BROKEN = 4
+          FAILED = 5
+        end
+
+        required :build_id, :uint64, 1
+        required :job_id, :uint64, 2
+        required :status, JobStatus::Status, 3
+        required :tm, :uint64, 4
+        required :tm_usec, :uint32, 5
+        repeated :matrix, :string, 6
+
+      end
+    end
+  end
+end

data/lib/evrone/ci/message/version.rb

@@ -1,7 +1,7 @@
 module Evrone
   module CI
     module Message
-      VERSION = "0.0.4"
+      VERSION = "0.2.0.pre0"
     end
   end
 end

data/proto/messages.proto

@@ -0,0 +1,77 @@
+package evrone.ci.message;
+
+message PerformBuild {
+  required uint64 id              = 1;
+  required string name            = 2;
+  required string src             = 3;
+  required string sha             = 4;
+  optional uint64 pull_request_id = 5;
+  optional string deploy_key      = 6;
+}
+
+message PerformJob {
+  required uint64 id              = 1;
+  required string name            = 2;
+  required string src             = 3;
+  required string sha             = 4;
+  optional uint64 pull_request_id = 5;
+  optional string deploy_key      = 6;
+  required uint64 job_id          = 7;
+  required string before_script   = 8;
+  required string script          = 9;
+  repeated string matrix_keys     = 10;
+}
+
+message BuildLog {
+  required uint64 build_id = 1;
+  required string log      = 2;
+  required uint64 tm       = 3;
+  required uint32 tm_usec  = 4;
+}
+
+message JobLog {
+  required uint64 build_id = 1;
+  required string log      = 2;
+  required uint64 tm       = 3;
+  required uint32 tm_usec  = 4;
+  required uint64 job_id   = 5;
+}
+
+message BuildStatus {
+  enum Status {
+    PENDING  = 0;
+    STARTED  = 2;
+    FINISHED = 3;
+    BROKEN   = 4;
+    FAILED   = 5;
+  }
+
+  required uint64 build_id            = 1;
+  required Status status              = 2;
+  required uint64 tm                  = 3;
+  required uint32 tm_usec             = 4;
+  required uint32 jobs_count          = 5;
+  repeated string matrix              = 6;
+
+  optional string commit_author       = 7;
+  optional string commit_author_email = 8;
+  optional string commit_sha          = 9;
+  optional string commit_message      = 10;
+}
+
+message JobStatus {
+  enum Status {
+    PENDING  = 0;
+    STARTED  = 2;
+    FINISHED = 3;
+    BROKEN   = 4;
+    FAILED   = 5;
+  }
+  required uint64 build_id = 1;
+  required uint64 job_id   = 2;
+  required Status status   = 3;
+  required uint64 tm       = 4;
+  required uint32 tm_usec  = 5;
+  repeated string matrix   = 6;
+}
+

data/spec/lib/message_spec.rb

@@ -15,19 +15,10 @@ describe Evrone::CI::Message do
       end
 
       it "should be successfuly serialized/deserialized" do
-        io = StringIO.new
-        subject.serialize(io)
-        io.rewind
-        obj = described_class.const_get(klass).parse(io)
+        bytes = subject.encode
+        obj = described_class.const_get(klass).decode(bytes)
         expect(obj.validate!).to be_true
-      end
-
-      it "should serialize via to_serialized_string" do
-        io = StringIO.new
-        subject.serialize(io)
-        io.rewind
-
-        expect(subject.to_serialized_string).to eq io.read
+        expect(obj).to eq subject
       end
 
       if %w{ PerformBuild PerformJob }.include?(klass)

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: evrone-ci-message
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.2.0.pre0
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ruby-protocol-buffers
+  name: beefcake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 0.3.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -83,8 +83,10 @@ files:
 - fixtures/insecure_private_key
 - fixtures/travis.yml
 - lib/evrone/ci/message.rb
+- lib/evrone/ci/message/messages.pb.rb
 - lib/evrone/ci/message/testing.rb
 - lib/evrone/ci/message/version.rb
+- proto/messages.proto
 - spec/lib/message_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -102,9 +104,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.2