Own all the dependencies

Use proper namespaces

Gemfile

@@ -12,13 +12,16 @@ gem 'carrierwave'
 gem 'sshkey'
 
 # vx-builder dependencies
-gem 'vx-message',           :github => 'pacoguzman/vx-message'
+gem 'vx-lib-message',       :github => 'pacoguzman/vx-message'
 gem 'vx-common',            :github => 'pacoguzman/vx-common', :branch => 'bebanjo'
 
 gem 'vx-builder',           :github => 'pacoguzman/vx-builder',           :branch => 'bebanjo'
 gem 'vx-service_connector', :github => 'pacoguzman/vx-service_connector', :branch => 'bebanjo'
 gem 'vx-consumer',          :github => 'pacoguzman/vx-consumer'
-gem 'vx-instrumentation',   '0.1.4'
+gem 'vx-instrumentation',   :github => 'pacoguzman/vx-instrumentation',   :tag => 'v0.1.4'
+
+gem 'vx-common-spawn',     :github => 'pacoguzman/vx-common-spawn'
+gem 'vx-lib-rack-builder', :github => 'pacoguzman/vx-common-rack-builder'
 
 gem 'dalli'
 gem 'dotenv'

Gemfile.lock

@@ -6,6 +6,19 @@ GIT
     vx-builder (0.5.50)
       hashr
 
+GIT
+  remote: git://github.com/pacoguzman/vx-common-rack-builder.git
+  revision: dd15ff1e50255113ec2856b275e975d3e450e449
+  specs:
+    vx-lib-rack-builder (0.0.3)
+
+GIT
+  remote: git://github.com/pacoguzman/vx-common-spawn.git
+  revision: abfa7792c175361924ce96d99c8fbb612e243607
+  specs:
+    vx-common-spawn (0.0.8)
+      net-ssh (~> 2.6)
+
 GIT
   remote: git://github.com/pacoguzman/vx-common.git
   revision: c6ea255328e25f5baae688219aaa11278a88a2b0
@@ -24,11 +37,19 @@ GIT
       bunny (= 1.6.3)
       vx-common-rack-builder (>= 0.0.2)
 
+GIT
+  remote: git://github.com/pacoguzman/vx-instrumentation.git
+  revision: c0163b33549877f33860a70dbf4b60c15866c0b9
+  tag: v0.1.4
+  specs:
+    vx-instrumentation (0.1.4)
+      activesupport (~> 4.0)
+
 GIT
   remote: git://github.com/pacoguzman/vx-message.git
-  revision: 9b9afe2ee95ab84a6ba56a7b7d47f4db554bd272
+  revision: 66f81a50b3a24897cd38f14d6456e024e6a5cd7c
   specs:
-    vx-message (0.6.2)
+    vx-lib-message (0.6.4)
       beefcake (= 1.0.0)
 
 GIT
@@ -144,7 +165,7 @@ GEM
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    net-ssh (2.9.1)
+    net-ssh (2.9.2)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     oauth (0.4.7)
@@ -244,10 +265,6 @@ GEM
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
     vx-common-rack-builder (0.0.2)
-    vx-common-spawn (0.0.8)
-      net-ssh (~> 2.6)
-    vx-instrumentation (0.1.4)
-      activesupport (~> 4.0)
     webmock (1.20.4)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -283,8 +300,10 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
   vx-builder!
   vx-common!
+  vx-common-spawn!
   vx-consumer!
-  vx-instrumentation (= 0.1.4)
-  vx-message!
+  vx-instrumentation!
+  vx-lib-message!
+  vx-lib-rack-builder!
   vx-service_connector!
   webmock

app/consumers/job_logs_consumer.rb

@@ -6,7 +6,7 @@ class JobLogsConsumer
   queue    'vx.web.jobs.log'
   ack
 
-  model Vx::Message::JobLog
+  model Vx::Lib::Message::JobLog
 
   def perform(message)
     JobLogsUpdater.new(message).perform

app/consumers/job_status_consumer.rb

@@ -6,7 +6,7 @@ class JobStatusConsumer
   queue    'vx.web.jobs.status'
   ack
 
-  model    Vx::Message::JobStatus
+  model    Vx::Lib::Message::JobStatus
 
   def perform(message)
     JobUpdater.new(message).perform

app/models/job.rb

@@ -94,7 +94,7 @@ def to_script_builder
 
   def to_perform_job_message
     script = to_script_builder
-    ::Vx::Message::PerformJob.new(
+    ::Vx::Lib::Message::PerformJob.new(
       company_id:      company.id,
       company_name:    company.name,
 

spec/models/build_notifier_spec.rb

@@ -2,7 +2,7 @@
 
 describe BuildNotifier do
   let(:status) { 3 }
-  let(:b)      { create :build, status: status, number: 1 }
+  let(:b)      { create :build, status: status, number: 1, http_url: "http://github.com/vexor/vx-test-repo" }
   let(:attrs)  { JSON.parse(b.attributes.to_json) }
   let(:notifier) { described_class.new attrs }
   subject { notifier }

spec/models/job_logs_updater_spec.rb

@@ -3,7 +3,7 @@
 describe JobLogsUpdater do
   let(:build)   { create :build }
   let(:job)     { create :job, build: build }
-  let(:message) { Vx::Message::JobLog.test_message job_id: job.id }
+  let(:message) { Vx::Lib::Message::JobLog.test_message job_id: job.id }
   let(:updater) { described_class.new message }
   subject { updater }
 

spec/models/job_updater_spec.rb

@@ -9,7 +9,7 @@
     job_id: uuid_for(3)
   } }
   let(:message)  {
-    Vx::Message::JobStatus.test_message(
+    Vx::Lib::Message::JobStatus.test_message(
       message_attributes
     )
   }

spec/support/job_updater_integration_helper.rb

@@ -38,7 +38,7 @@ def perform(job, options = {})
   end
 
   def message(job, status, tm = nil)
-    Vx::Message::JobStatus.test_message(
+    Vx::Lib::Message::JobStatus.test_message(
       company_id:   job.company.id,
       project_id:   job.project.id,
       build_id:     job.build_id,