vx-message 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93fc9b03decef64aafb552293a6f25d28a5cbe9a
-  data.tar.gz: e981a507e7feac92bc30e6b7ac9a89000430f7d4
+  metadata.gz: f8f8d71cae4e55deab7701669d987c6926505175
+  data.tar.gz: 624c10e3bc1203e05233ac5f1277d5acac3f0615
 SHA512:
-  metadata.gz: d82c2e03a12aba791073b0a798154697f94e415cd6220c6be11540d4dfcdc9085731edbc9209c0cb532ba8a7925577dadc8531d33a17ed2a07f14a7d13c28ccf
-  data.tar.gz: 277b5367029fa221b42d93ffb98c25104de565aac28c733f612adcc30143984c372ef1a0fe6acaea291293a1b3c104442b66b0d24e6e153234de3e1073d1d0c7
+  metadata.gz: 66a6c6eb52c8e2a2f193f0a7933b318a7530953dd4d4f0ec5acff0ab11329d0a8c02d7839667be8f138b4e73149d8aa49f4ce65d9e87c656787db8ac3f27c88c
+  data.tar.gz: 8da2d15e9f597aba52ae5886fc4d84e63d15ac51ab92c911e0855d9ed88646778e85af16dfc01027872e492d4f7a9d6b493ac74b36450b4eb307b282a0d0a9aa

data/.travis.yml

@@ -1,5 +1,5 @@
 rvm:
   - 2.0.0
-  - 2.1.0
+  - 2.1.2
 
 script: "bundle exec rake travis"

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

@@ -6,43 +6,14 @@ module Vx
 
     class PerformBuild
       include Beefcake::Message
-
-
-      required :id, :uint64, 1
-      required :name, :string, 2
-      required :src, :string, 3
-      required :sha, :string, 4
-      optional :deploy_key, :string, 6
-      required :travis, :string, 7
-      required :branch, :string, 8
-      optional :pull_request_id, :uint64, 9
-
     end
 
     class PerformJob
       include Beefcake::Message
-
-
-      required :project_id, :uint64, 1
-      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
-      optional :image, :string, 8
-
     end
 
     class JobLog
       include Beefcake::Message
-
-
-      required :build_id, :uint64, 1
-      required :log, :string, 2
-      required :tm, :uint64, 3
-      required :job_id, :uint64, 5
-
     end
 
     class JobStatus
@@ -55,13 +26,61 @@ module Vx
         BROKEN = 4
         FAILED = 5
       end
+    end
 
-      required :project_id, :uint64, 1
-      required :build_id, :uint64, 2
-      required :job_id, :uint64, 3
-      required :status, JobStatus::Status, 4
-      required :tm, :uint64, 5
+    class PerformBuild
+      required :id, :uint64, 1
+      required :name, :string, 2
+      required :src, :string, 3
+      required :sha, :string, 4
+      optional :deploy_key, :string, 6
+      required :travis, :string, 7
+      required :branch, :string, 8
+      optional :pull_request_id, :uint64, 9
+    end
+
+    class PerformJob
+      required :company_id, :string, 1
+      required :company_name, :string, 2
+      required :project_id, :string, 3
+      required :project_name, :string, 4
+      required :build_id, :string, 5
+      required :build_number, :uint64, 6
+      required :job_id, :string, 7
+      required :job_number, :uint64, 8
+      required :job_version, :uint64, 9
+      required :before_script, :string, 10
+      required :script, :string, 11
+      required :after_script, :string, 12
+      optional :image, :string, 13
+    end
 
+    class JobLog
+      required :company_id, :string, 1
+      required :company_name, :string, 2
+      required :project_id, :string, 3
+      required :project_name, :string, 4
+      required :build_id, :string, 5
+      required :build_number, :uint64, 6
+      required :job_id, :string, 7
+      required :job_number, :uint64, 8
+      required :job_version, :uint64, 9
+      required :log, :string, 10
+      required :tm, :uint64, 11
+    end
+
+    class JobStatus
+      required :company_id, :string, 1
+      required :company_name, :string, 2
+      required :project_id, :string, 3
+      required :project_name, :string, 4
+      required :build_id, :string, 5
+      required :build_number, :uint64, 6
+      required :job_id, :string, 7
+      required :job_number, :uint64, 8
+      required :job_version, :uint64, 9
+      required :status, JobStatus::Status, 10
+      required :tm, :uint64, 11
     end
   end
 end

data/lib/vx/message/testing.rb

@@ -4,17 +4,30 @@ require File.expand_path("../../message", __FILE__)
 module Vx
   module Message
 
+    @@common = {
+      company_id:   '1',
+      company_name: 'company name',
+      project_id:   '2',
+      project_name: 'project name',
+      build_id:     '3',
+      build_number: 4,
+      job_id:       '5',
+      job_number:   6,
+      job_version:  1
+    }
+
+    def self.common
+      @@common
+    end
+
     class JobStatus
       class << self
 
         def test_attributes(options = {})
-          {
-            project_id: 1,
-            build_id:   1,
-            job_id:     2,
+          Message.common.merge(
             status:     0,
             tm:         1376137604,
-          }.merge(options)
+          ).merge(options)
         end
 
         def test_message(options = {})
@@ -28,12 +41,10 @@ module Vx
       class << self
 
         def test_attributes(options = {})
-          {
-            build_id: 1,
-            job_id:   2,
-            log:      'log',
-            tm:       1376137604,
-          }.merge(options)
+          Message.common.merge(
+            log: 'log',
+            tm:  1376137604,
+          ).merge(options)
         end
 
         def test_message(options = {})
@@ -47,39 +58,11 @@ module Vx
       class << self
 
         def test_attributes(options = {})
-          options.merge({
-            project_id:    options[:project_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',
-            script:        options[:script]        || 'echo script',
-            after_script:  options[:after_script]  || 'echo after_script'
-          })
-        end
-
-        def test_message(options = {})
-          new test_attributes(options)
-        end
-
-      end
-    end
-
-    class PerformBuild
-      class << self
-
-        def test_attributes(options = {})
-          key = File.read File.expand_path("../../../../fixtures/insecure_private_key", __FILE__)
-          travis = File.read File.expand_path("../../../../fixtures/travis.yml", __FILE__)
-          options.merge({
-            id:         options[:id]         || 1,
-            name:       options[:name]       || 'evrone/test-repo',
-            src:        options[:src]        || "git@github.com:dima-exe/ci-worker-test-repo.git",
-            sha:        options[:sha]        || "b665f90239563c030f1b280a434b3d84daeda1bd",
-            deploy_key: options[:deploy_key] || key,
-            travis:     options[:travis]     || travis,
-            branch:     options[:branch]     || "master"
-          })
+          Message.common.merge(
+            before_script: 'echo before_script',
+            script:        'echo script',
+            after_script:  'echo after_script',
+          ).merge(options)
         end
 
         def test_message(options = {})

data/lib/vx/message/version.rb

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

data/proto/messages.proto

@@ -1,32 +1,41 @@
 package vx.message;
 
-message PerformBuild {
-  required uint64 id              = 1;
-  required string name            = 2;
-  required string src             = 3;
-  required string sha             = 4;
-  optional string deploy_key      = 6;
-  required string travis          = 7;
-  required string branch          = 8;
-  optional uint64 pull_request_id = 9;
-}
-
 message PerformJob {
-  required uint64 project_id      = 1;
-  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;
-  optional string image           = 8;
+  required string company_id      = 1;
+  required string company_name    = 2;
+
+  required string project_id      = 3;
+  required string project_name    = 4;
+
+  required string build_id        = 5;
+  required uint64 build_number    = 6;
+
+  required string job_id          = 7;
+  required uint64 job_number      = 8;
+  required uint64 job_version     = 9;
+
+  required string before_script   = 10;
+  required string script          = 11;
+  required string after_script    = 12;
+  optional string image           = 13;
 }
 
 message JobLog {
-  required uint64 build_id = 1;
-  required string log      = 2;
-  required uint64 tm       = 3;
-  required uint64 job_id   = 5;
+  required string company_id      = 1;
+  required string company_name    = 2;
+
+  required string project_id      = 3;
+  required string project_name    = 4;
+
+  required string build_id        = 5;
+  required uint64 build_number    = 6;
+
+  required string job_id          = 7;
+  required uint64 job_number      = 8;
+  required uint64 job_version     = 9;
+
+  required string log             = 10;
+  required uint64 tm              = 11;
 }
 
 message JobStatus {
@@ -37,10 +46,21 @@ message JobStatus {
     BROKEN      = 4;
     FAILED      = 5;
   }
-  required uint64 project_id = 1;
-  required uint64 build_id   = 2;
-  required uint64 job_id     = 3;
-  required Status status     = 4;
-  required uint64 tm         = 5;
+
+  required string company_id      = 1;
+  required string company_name    = 2;
+
+  required string project_id      = 3;
+  required string project_name    = 4;
+
+  required string build_id        = 5;
+  required uint64 build_number    = 6;
+
+  required string job_id          = 7;
+  required uint64 job_number      = 8;
+  required uint64 job_version     = 9;
+
+  required Status status          = 10;
+  required uint64 tm              = 11;
 }
 

data/spec/lib/message_spec.rb

@@ -3,7 +3,7 @@ require 'stringio'
 
 describe Vx::Message do
 
-  %w{ PerformBuild PerformJob JobLog JobStatus }.each do |klass|
+  %w{ PerformJob JobLog JobStatus }.each do |klass|
 
     context "#{klass}" do
 
@@ -11,13 +11,13 @@ describe Vx::Message do
       subject { inst.test_message }
 
       it "should be valid" do
-        expect(subject.validate!).to be_true
+        expect(subject.validate!).to be
       end
 
       it "should be successfuly serialized/deserialized" do
         bytes = subject.encode
         obj = described_class.const_get(klass).decode(bytes)
-        expect(obj.validate!).to be_true
+        expect(obj.validate!).to be
         expect(obj).to eq subject
       end
 

data/vx-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 'beefcake', '= 0.3.7'
+  spec.add_runtime_dependency 'beefcake', '= 0.5.0'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-message
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-08 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Evrone CI message