gisha 0.0.10 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a0d452ccdc07a8d081881c809f45aa09fc4ed2e
-  data.tar.gz: fe7aa893f54a4a400ce4bf1cc7aca725166670c0
+  metadata.gz: d2b2c495bbde5ba6ea9d3387f75753de05844422
+  data.tar.gz: 44de1301df26889574ec4535522de696dc34444b
 SHA512:
-  metadata.gz: e65be5c4a1d470cd7c099babdd30698577ba4f69ecfffd555c9dae340cc861bfaa7c902855400a2a2ed6711d20420e641d6dd86836fdd49964dfd6ae7e58935c
-  data.tar.gz: f00c7e83e386b55bf8597dcc81db4aedd7356870bef58ad2a4a4f123fc590f28a0493f48219b1421247200265f11fb0ab8bd4114549f456cc58751691b8cc3dc
+  metadata.gz: 2cb97f5e10f5e831325c5057fba8d217c882d9b60f1899924184870f42e7f054571c7f137ced67d484b0fa3bfc251e9d6857e0a57c56efeff72a412f4ef43e4e
+  data.tar.gz: 3e4f7a3980c42c068a48d4392d846af59fda6e3f8b076cf0670e48ba0dd20187e04580a6ecb2cfe97271a8a8ee141b6b4020a2b2715afc48efaaf9c813fcf54c

data/Dockerfile

@@ -0,0 +1,28 @@
+# spass/receiver
+#
+#
+
+FROM spass/base:latest
+
+# Set the env variables
+ENV GITHOME /home/git
+ENV GITUSER git
+
+RUN apt-get update -y
+RUN apt-get install --no-install-recommends -qy cmake pkg-config libgit2-dev
+
+RUN rm -f /etc/ssh/ssh_host_*
+RUN dpkg-reconfigure openssh-server 2> /dev/null
+RUN mkdir -p /var/run/sshd
+
+# configure git user
+RUN useradd -create-home --home $GITHOME --shell /bin/bash --password "`</dev/urandom tr -dc A-Za-z0-9 | head -c20`" $GITUSER
+RUN mkdir -p $GITHOME/.ssh && chown git:git $GITHOME/.ssh && chmod 700 $GITHOME/.ssh
+
+RUN chown -R $GITUSER:$GITUSER $GITHOME
+
+RUN gem install gisha
+
+EXPOSE 22
+
+CMD /usr/sbin/sshd -D

data/Gemfile.lock

@@ -0,0 +1,81 @@
+PATH
+  remote: .
+  specs:
+    gisha (0.1.0)
+      clamp
+      dotenv
+      em-eventsource
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.3.6)
+    clamp (0.6.3)
+    cookiejar (0.3.2)
+    coveralls (0.7.2)
+      multi_json (~> 1.3)
+      rest-client (= 1.6.7)
+      simplecov (>= 0.7)
+      term-ansicolor (= 1.2.2)
+      thor (= 0.18.1)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    dotenv (1.0.2)
+    em-eventsource (0.2.0)
+      em-http-request (>= 1.0.0)
+      eventmachine (>= 1.0.0.beta3)
+    em-http-request (1.1.2)
+      addressable (>= 2.3.4)
+      cookiejar
+      em-socksify (>= 0.3)
+      eventmachine (>= 1.0.3)
+      http_parser.rb (>= 0.6.0)
+    em-socksify (0.3.0)
+      eventmachine (>= 1.0.0.beta.4)
+    eventmachine (1.0.7)
+    http_parser.rb (0.6.0)
+    mime-types (2.4.3)
+    multi_json (1.10.1)
+    rake (10.1.0)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    safe_yaml (1.0.4)
+    simplecov (0.9.1)
+      docile (~> 1.1.0)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
+    thor (0.18.1)
+    tins (0.13.2)
+    vcr (2.9.3)
+    webmock (1.20.4)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.5)
+  coveralls
+  gisha!
+  rake
+  rspec
+  vcr
+  webmock

data/Rakefile

@@ -3,4 +3,4 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new('spec')
 
-task default: :spec
+task default: :spec

data/bin/gisha

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 
+require 'dotenv'
 require 'gisha'
 
+Dotenv.load('/environment')
+
 Gisha::CLI.run

data/lib/gisha/cli.rb

@@ -14,46 +14,6 @@ module Gisha
     end
   end
 
-  class AddKeyCommand < Clamp::Command
-    parameter 'ID', 'id to identify the key'
-    parameter 'KEY', 'public key that was provided to the server'
-    parameter 'AUTH_FILE', 'file containing public keys for public key authentication'
-
-    def execute
-      Commands::Key.new(auth_file, id, key).add
-    end
-
-  end
-
-  class DeleleteKeyCommand < Clamp::Command
-    parameter 'ID', 'id to identify the key'
-    parameter 'AUTH_FILE', 'file containing public keys for public key authentication;'
-
-    def execute
-      Commands::Key.new(auth_file, id).del
-    end
-  end
-
-  class CreateRepositoryCommand < Clamp::Command
-    parameter 'PATH', 'path to create repository'
-
-    def execute
-      Rugged::Repository.init_at(path, :bare)
-      FileUtils.cp("#{root_path}/hooks/update", "#{path}/hooks")
-    end
-
-    def root_path
-      @root_path ||= File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
-    end
-  end
-
-  class DeleteRepositoryCommand < Clamp::Command
-    parameter 'PATH', 'path to delete repository'
-
-    def execute
-      FileUtils.rm_rf(path)
-    end
-  end
 
   class DeployCommand < Clamp::Command
     parameter 'URL', 'url to deploy'
@@ -67,12 +27,6 @@ module Gisha
   end
 
   class CLI < Clamp::Command
-    subcommand 'keys:add', 'add new key', AddKeyCommand
-    subcommand 'keys:del', 'delete key', DeleleteKeyCommand
-
-    subcommand 'repositories:create', 'create repository', CreateRepositoryCommand
-    subcommand 'repositories:delete', 'delete repository', DeleteRepositoryCommand
-
     subcommand 'receive', 'receive what is pushed into the repository', ReceiveCommand
     subcommand 'deploy', 'deploy to spass', DeployCommand
   end

data/lib/gisha/commands/deploy.rb

@@ -2,24 +2,31 @@ require 'em-eventsource'
 
 module Gisha
   class Commands::Deploy
-    attr_accessor :url, :key_id, :repo_path, :revision
+    attr_accessor :url, :key_id, :app_name, :revision
 
-    def initialize(url, key_id, repo_path, revision)
+    def initialize(url, key_id, app_name, revision)
       @url = url
       @key_id = key_id
-      @repo_path = repo_path
+      @app_name = app_name
       @revision = revision
     end
 
     def exec
       EM.run do
-        source = EventMachine::EventSource.new(url)
+        source = EventMachine::EventSource.new(deploy_url)
 
-        source.on('progress') do |message|
+        source.inactivity_timeout = 180
+
+        source.on('start') do |message|
+          write(message)
+        end
+
+        source.on('chunk') do |message|
           write(message)
         end
 
-        source.on('completed') do |message|
+        source.on('stop') do |message|
+          write(message)
           source.close
           EM.stop
         end
@@ -30,6 +37,7 @@ module Gisha
           EM.stop
           raise ArgumentError, error
         end
+
         source.start
       end
 
@@ -37,6 +45,10 @@ module Gisha
 
     private
 
+    def deploy_url
+      "#{url}?key_id=#{key_id}&app_name=#{app_name}&revision=#{revision}"
+    end
+
     def repo_name
       repo_path.split('/').last
     end
@@ -46,7 +58,7 @@ module Gisha
         $stdout.sync = true
         $stdout
       end
-      @stdout.write "\e[1G-----> #{msg}\n"
+      @stdout.write msg
     end
 
   end

data/lib/gisha/commands/receive.rb

@@ -20,7 +20,7 @@ module Gisha
     end
 
     def repos_path
-      @repos_path ||= File.join(ENV['HOME'], "repositories")
+      '/store/repositories'
     end
 
     private

data/lib/gisha/version.rb

@@ -1,3 +1,3 @@
 module Gisha
-  VERSION = '0.0.10'
+  VERSION = '0.1.0'
 end

data/lib/gisha.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gisha
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors:
 - Salvatore Ferrucci
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rugged
-  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: em-eventsource
   requirement: !ruby/object:Gem::Requirement
@@ -102,18 +88,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- Dockerfile
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/gisha
-- gisha.gemspec
-- 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/version.rb
 - spec/lib/gisha/commands/receive_spec.rb

data/.gitignore

@@ -1,17 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/gisha.gemspec

@@ -1,28 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'gisha/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'gisha'
-  spec.version       = Gisha::VERSION
-  spec.authors       = ['Salvatore Ferrucci']
-  spec.email         = ['salvatore@algonauti.com']
-  spec.summary       = %q{Easily accept and handle arbitrary git pushes}
-  spec.description   = %q{Easily accept and handle arbitrary git pushes}
-  spec.homepage      = 'https://github.com/algonauti/gisha'
-  spec.license       = 'MIT'
-
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
-
-  spec.add_dependency 'dotenv'
-  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'
-end

data/hooks/update

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-require 'dotenv'
-Dotenv.load('/etc/environment')
-
-require 'gisha'
-
-ref_name = ARGV[0]
-old_revision = ARGV[1]
-new_revision = ARGV[2]
-repository_path = Dir.pwd
-key_id = ENV['KEY_ID']
-deploy_url = ENV['SPASS_DEPLOY_URL']
-
-begin
-  Gisha::CLI.run 'gisha', ['deploy', deploy_url, key_id, repository_path, new_revision]
-rescue
-  exit 1
-end

data/lib/gisha/commands/key.rb

@@ -1,54 +0,0 @@
-module Gisha
-  class Commands::Key
-    attr_reader :auth_file, :id, :key
-
-    def initialize(auth_file, id, key = nil)
-      @auth_file = auth_file
-      @id = id
-      @key = key
-    end
-
-    def add
-      lock do
-        open(auth_file, 'a') { |file| file.puts(key_line) }
-      end
-    end
-
-    def del
-      lock do
-        Tempfile.open('authorized_keys') do |temp|
-          open(auth_file, 'r+') do |current|
-            current.each do |line|
-              temp.puts(line) unless line.include?("gisha receive key-#{id}")
-            end
-          end
-          temp.close
-          FileUtils.cp(temp.path, auth_file)
-        end
-      end
-    end
-
-
-    private
-
-    def key_line
-      auth_line = "command=\"gisha receive key-#{id}\",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty #{key}"
-    end
-
-    def lock(timeout = 10)
-      File.open(lock_file, "w+") do |f|
-        begin
-          f.flock File::LOCK_EX
-          Timeout::timeout(timeout) { yield }
-        ensure
-          f.flock File::LOCK_UN
-        end
-      end
-    end
-
-    def lock_file
-      @lock_file ||= auth_file + '.lock'
-    end
-
-  end
-end