vx-message 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc2c454e442e628a32526ad5e87242bb09e93fc1
-  data.tar.gz: b6ce5162044b4ff7ffabff1fee2ad56b9c3401b8
+  metadata.gz: 93fc9b03decef64aafb552293a6f25d28a5cbe9a
+  data.tar.gz: e981a507e7feac92bc30e6b7ac9a89000430f7d4
 SHA512:
-  metadata.gz: 571db7e2f7e41ff5b62e5dce7df592eaf289a5c475d9057215075d3771bd9c5b40b59bedb71ea13b4d5ad19460b97226c89b43e48e5d72398718a3785629b516
-  data.tar.gz: dffda3acef3e9632d0bd3d574762ec1e0cf1e6c00f2d02a70586db264df66c6530e97e2dd6c32d5d29e4223554498086e88adbea2628e0ee3003bec14b7009f2
+  metadata.gz: d82c2e03a12aba791073b0a798154697f94e415cd6220c6be11540d4dfcdc9085731edbc9209c0cb532ba8a7925577dadc8531d33a17ed2a07f14a7d13c28ccf
+  data.tar.gz: 277b5367029fa221b42d93ffb98c25104de565aac28c733f612adcc30143984c372ef1a0fe6acaea291293a1b3c104442b66b0d24e6e153234de3e1073d1d0c7

data/lib/vx/message/messages.pb.rb

@@ -24,22 +24,13 @@ module Vx
 
 
       required :project_id, :uint64, 1
-      required :id, :uint64, 2
+      required :build_id, :uint64, 2
       required :name, :string, 3
       required :job_id, :uint64, 4
       required :before_script, :string, 5
       required :script, :string, 6
       required :after_script, :string, 7
-
-    end
-
-    class BuildLog
-      include Beefcake::Message
-
-
-      required :build_id, :uint64, 1
-      required :log, :string, 2
-      required :tm, :uint64, 3
+      optional :image, :string, 8
 
     end
 
@@ -54,24 +45,6 @@ module Vx
 
     end
 
-    class BuildStatus
-      include Beefcake::Message
-
-      module Status
-        INITIALIZED = 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 :jobs_count, :uint32, 5
-
-    end
-
     class JobStatus
       include Beefcake::Message
 

data/lib/vx/message/testing.rb

@@ -4,24 +4,6 @@ require File.expand_path("../../message", __FILE__)
 module Vx
   module Message
 
-    class BuildInfo
-      class << self
-
-        def test_attributes(options = {})
-          {
-            build_id:       1,
-            commit_author:  'Автор по русски',
-            commit_message: 'Сообщение по русски',
-          }.merge(options)
-        end
-
-        def test_message(options = {})
-          new test_attributes(options)
-        end
-
-      end
-    end
-
     class JobStatus
       class << self
 
@@ -42,25 +24,6 @@ module Vx
       end
     end
 
-    class BuildStatus
-      class << self
-
-        def test_attributes(options = {})
-          {
-            build_id: 1,
-            status:   0,
-            tm:       1376137604,
-            jobs_count: 1,
-          }.merge(options)
-        end
-
-        def test_message(options = {})
-          new test_attributes(options)
-        end
-
-      end
-    end
-
     class JobLog
       class << self
 
@@ -80,31 +43,13 @@ module Vx
       end
     end
 
-    class BuildLog
-      class << self
-
-        def test_attributes(options = {})
-          {
-            build_id: 1,
-            log:      'log',
-            tm:       1376137604,
-          }.merge(options)
-        end
-
-        def test_message(options = {})
-          new test_attributes(options)
-        end
-
-      end
-    end
-
     class PerformJob
       class << self
 
         def test_attributes(options = {})
           options.merge({
             project_id:    options[:project_id]    || 1,
-            id:            options[:id]            || 1,
+            build_id:      options[:build_id]      || 1,
             name:          options[:name]          || 'evrone/test-repo',
             job_id:        options[:job_id]        || 2,
             before_script: options[:before_script] || 'echo before_script',

data/lib/vx/message/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Message
-    VERSION = "0.4.1"
+    VERSION = "0.5.0"
   end
 end

data/proto/messages.proto

@@ -13,18 +13,13 @@ message PerformBuild {
 
 message PerformJob {
   required uint64 project_id      = 1;
-  required uint64 id              = 2;
+  required uint64 build_id        = 2;
   required string name            = 3;
   required uint64 job_id          = 4;
   required string before_script   = 5;
   required string script          = 6;
   required string after_script    = 7;
-}
-
-message BuildLog {
-  required uint64 build_id = 1;
-  required string log      = 2;
-  required uint64 tm       = 3;
+  optional string image           = 8;
 }
 
 message JobLog {
@@ -34,21 +29,6 @@ message JobLog {
   required uint64 job_id   = 5;
 }
 
-message BuildStatus {
-  enum Status {
-    INITIALIZED = 0;
-    STARTED     = 2;
-    FINISHED    = 3;
-    BROKEN      = 4;
-    FAILED      = 5;
-  }
-
-  required uint64 build_id            = 1;
-  required Status status              = 2;
-  required uint64 tm                  = 3;
-  required uint32 jobs_count          = 5;
-}
-
 message JobStatus {
   enum Status {
     INITIALIZED = 0;

data/spec/lib/message_spec.rb

@@ -3,7 +3,7 @@ require 'stringio'
 
 describe Vx::Message do
 
-  %w{ PerformBuild PerformJob BuildLog JobLog BuildStatus JobStatus }.each do |klass|
+  %w{ PerformBuild PerformJob JobLog JobStatus }.each do |klass|
 
     context "#{klass}" do
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-message
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake