gisha 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 189959371d8b60434210b71ff7fd29e4c5e63695
-  data.tar.gz: c2ec3d8a0919b1d267b5aa36955f08e59573f1e6
+  metadata.gz: 71693b315b8357c394cd38e1a410a32e93674cd6
+  data.tar.gz: 0e73a174ac2d38b91f266eb43d02614d327f1338
 SHA512:
-  metadata.gz: 53ea7ca34065bfa949d045b8dafb243ba62822317d4a7fa775982aa193156e01c6e145e88e26b40e3f564ed7d4606babade41e74e0f23cc23fe3ef296d767fe2
-  data.tar.gz: f5ec5a373cfd5d3b16770eedcfb1d25a1cea0140e8dd69d8bd234fb9d8139b4eaf28a55cf4da575cd1627257570ec0fe8dba89fb7d2a5ed4f0dec6678ea2305d
+  metadata.gz: fadfaea2b82219bd2bcd6ddb8b157fc1a50b5ea256e1ac38724c7494f9d89f44ace13d46e79a039d269461cd720216cab1ac33c0ae65cb499a44c02dee349932
+  data.tar.gz: ed32ba0410387ec244dd6dc08547c3287c7d993aa5ff6459b45ea2e816fb0eb6c26c497a9639acad859c61905d01f7814680ab2f0074643bf82c70b83a661eb0

data/gisha.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'clamp'
   spec.add_dependency 'rugged'
+  spec.add_dependency 'em-eventsource'
 
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake'

data/hooks/update

@@ -3,14 +3,14 @@
 ref_name = ARGV[0]
 old_revision = ARGV[1]
 new_revision = ARGV[2]
-key_id = ENV['KEY_ID']
 repository_path = Dir.pwd
-
+key_id = ENV['KEY_ID']
+deploy_url = "#{ENV['SPASS_CONTROLLER_URL']}/api/deploy/start"
 
 require 'gisha'
 
 begin
-  Gisha::CLI.run 'gisha', ['update', key_id, repository_path, new_revision]
+  Gisha::CLI.run 'gisha', ['update', deploy_url, key_id, repository_path, new_revision]
 rescue
   exit 1
 end

data/lib/gisha/cli.rb

@@ -55,13 +55,14 @@ module Gisha
     end
   end
 
-  class UpdateCommand < Clamp::Command
+  class DeployCommand < Clamp::Command
+    parameter 'URL', 'url to deploy'
     parameter 'KEY_ID', 'id to identify the key'
     parameter 'PATH', 'repository path'
     parameter 'REVISION', 'repository path'
 
     def execute
-      Commands::Update.new(key_id, path, revision).exec
+      Commands::Deploy.new(url, key_id, path, revision).exec
     end
   end
 
@@ -73,7 +74,7 @@ module Gisha
     subcommand 'repositories:delete', 'delete repository', DeleteRepositoryCommand
 
     subcommand 'receive', 'receive what is pushed into the repository', ReceiveCommand
-    subcommand 'update', 'update repository to last version', UpdateCommand
+    subcommand 'deploy', 'deploy to spass', DeployCommand
   end
 
 end

data/lib/gisha/commands/deploy.rb

@@ -0,0 +1,48 @@
+require 'em-eventsource'
+
+module Gisha
+  class Commands::Deploy
+    attr_accessor :url, :key_id, :repo_path, :revision
+
+    def initialize(url, key_id, repo_path, revision)
+      @url = url
+      @key_id = key_id
+      @repo_path = repo_path
+      @revision = revision
+    end
+
+    def exec
+      EM.run do
+        source = EventMachine::EventSource.new(url)
+
+        source.on('progress') do |message|
+          write(message)
+        end
+
+        source.on('completed') do |message|
+          source.close
+          EM.stop
+        end
+
+        source.error do |error|
+          write(error)
+          source.close
+          EM.stop
+        end
+        source.start
+      end
+
+    end
+
+    private
+
+    def repo_name
+      repo_path.split('/').last
+    end
+
+    def write(msg)
+      puts "\e[1G-----> #{msg}\n"
+    end
+
+  end
+end

data/lib/gisha/commands/receive.rb

@@ -31,7 +31,13 @@ module Gisha
     end
 
     def exec_cmd(*args)
-      Kernel::exec({'PATH' => ENV['PATH'], 'LD_LIBRARY_PATH' => ENV['LD_LIBRARY_PATH'], 'KEY_ID' => key_id}, *args, unsetenv_others: true)
+      Kernel::exec(
+      {
+        'PATH' => ENV['PATH'],
+        'LD_LIBRARY_PATH' => ENV['LD_LIBRARY_PATH'],
+        'SPASS_CONTROLLER_URL' => ENV['SPASS_CONTROLLER_URL'],
+        'KEY_ID' => key_id
+      }, *args, unsetenv_others: true)
     end
 
     def parse_cmd

data/lib/gisha/version.rb

@@ -1,3 +1,3 @@
 module Gisha
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/gisha.rb

@@ -4,7 +4,7 @@ module Gisha
 
   module Commands
     autoload 'Receive', 'gisha/commands/receive'
-    autoload 'Update', 'gisha/commands/update'
+    autoload 'Deploy', 'gisha/commands/deploy'
     autoload 'Key',     'gisha/commands/key'
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gisha
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Salvatore Ferrucci
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: em-eventsource
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -84,9 +98,9 @@ files:
 - hooks/update
 - lib/gisha.rb
 - lib/gisha/cli.rb
+- lib/gisha/commands/deploy.rb
 - lib/gisha/commands/key.rb
 - lib/gisha/commands/receive.rb
-- lib/gisha/commands/update.rb
 - lib/gisha/version.rb
 - spec/lib/gisha/commands/receive_spec.rb
 - spec/spec_helper.rb

data/lib/gisha/commands/update.rb

@@ -1,22 +0,0 @@
-module Gisha
-  class Commands::Update
-    attr_accessor :key_id, :repo_path, :revision
-
-    def initialize(key_id, repo_path, revision)
-      @key_id = key_id
-      @repo_path = repo_path
-      @revision = revision
-    end
-
-    def exec
-      puts "Update repo: #{repo_name} to revision: #{revision} by key: #{key_id}"
-    end
-
-    private
-
-    def repo_name
-      repo_path.split('/').last
-    end
-
-  end
-end