theine 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44a70acdfb48ffa54a63ec3720c61082f30342d2
-  data.tar.gz: 3a3c2dd8947da2b1f637f4950c08ca5511dea769
+  metadata.gz: 3d99c6739774edb55cc9b94d1a9188207569e942
+  data.tar.gz: a207395e8d396715f78fb45820c6b7e05894ca85
 SHA512:
-  metadata.gz: d57a7544fd0f61d71a851aba79decded6ef277652a1e3f779c914d32dcf1ea7f12f0f805650714b5f11b597dab272dacb59afea8e671a15028b86ce81ecb15d4
-  data.tar.gz: fe22098198bb33413f763bd98de9117c2754c6ad3b00ccc4ae7fca432e73e9d1d1159b9e49e4115af076d4aa32d4dbfc0d3a5a7416518ab7dcfd0e30890ac185
+  metadata.gz: e4c0f716db657abe2e2eee2e7a9869be61f6364910d4cc9c1ae2125436f2c831c79fe94f957d8795b8bc60c7ce16c371e7af86d0e9f09e3453d69a6b040c1481
+  data.tar.gz: 5482ddfff27f95cbf9ce72d18a0190d16f1d7219295f9be116094b7786a7e66547f3acce1dee00d4edcd9a17e05b18225eab1bc3003738c07f58518315f4dff7

data/lib/theine/client.rb

@@ -23,19 +23,25 @@ module Theine
 
   private
     def attach_screen
-      exec("screen -r theine#{@port}")
+      # Using vt100 because it does not have smcup/rmcup support,
+      # which means the output of the screen will stay shown after
+      # screen closes.
+      set_vt_100 = "export TERM=vt100; tset"
+      erase_screen_message = "echo '\\033[2A\\033[K'"
+      exec("#{set_vt_100}; screen -r theine#{@port}; #{erase_screen_message}")
     end
 
     def run_command
-      case @argv[0]
+      argv = @argv.dup
+      command = argv.shift
+
+      case command
       when "rake"
-        @argv.shift
-        @worker.command_rake(@argv)
+        @worker.command_rake(argv)
       when "rspec"
-        @argv.shift
-        @worker.command_rspec(@argv)
+        @worker.command_rspec(argv)
       else
-        @worker.command_rails(@argv)
+        @worker.command_rails([command] + argv)
       end
     rescue DRb::DRbConnError
       $stderr.puts "\nTheine closed the connection."

data/lib/theine/server.rb

@@ -29,7 +29,7 @@ module Theine
       puts "(spawn #{port})"
       spawn("screen", "-d", "-m", "-S", worker_session_name(port),
         "sh", "-c",
-        "ruby #{path} #{config.base_port.to_s} #{port.to_s} #{config.rails_root}; read -p 'Press [Enter] to exit...\n'")
+        "ruby #{path} #{config.base_port.to_s} #{port.to_s} #{config.rails_root}")
       @workers_mutex.synchronize { @spawning_workers << port }
     end
 

data/lib/theine/worker.rb

@@ -4,40 +4,48 @@ require 'drb/drb'
 
 module Theine
   class Worker
-    attr_reader :command_proc
+    attr_reader :port, :balancer
 
-    def initialize
-      @pumps = []
-      @command_proc = proc { }
-    end
-
-    def boot
-      require "#{RAILS_ROOT_PATH}/config/boot"
-      require "#{RAILS_ROOT_PATH}/config/environment"
-    end
-
-    def command_rails(argv)
-      ARGV.clear
-      ARGV.concat(argv)
-
-      set_command do
+    COMMANDS = {
+      rails: proc {
         require 'rails/commands'
-      end
-    end
-
-    def command_rake(argv)
-      set_command do
+      },
+      rake: proc {
         ::Rails.application.load_tasks
         argv.each do |task|
           ::Rake::Task[task].invoke
         end
+      },
+      rspec: proc {
+        require 'rspec/core'
+        RSpec::Core::Runner.autorun
+      }
+    }
+
+    def initialize(port, balancer)
+      @port = port
+      @balancer = balancer
+      @command_proc = proc { }
+    end
+
+    def run
+      boot
+      begin
+        DRb.thread.join
+        screen_move_to_bottom
+        sleep 0.1 while !screen_attached?
+
+        puts "command: #{@command_name} #{argv_to_s}"
+        @command_proc.call
+      ensure
+        balancer.worker_done(port)
       end
     end
 
-    def command_rspec(argv)
-      set_command do
-        require 'rspec/core'
-        ::RSpec::Core::Runner.run(argv, $stderr, $stdout)
+    COMMANDS.each_pair do |command_name, command|
+      define_method("command_#{command_name}") do |argv|
+        set_argv(argv)
+        set_command(command_name, &command)
       end
     end
 
@@ -48,35 +56,60 @@ module Theine
     def stop!
       exit(1)
     end
+
+    def screen_attached?
+      !system("screen -ls | grep theine#{@port} | grep Detached > /dev/null")
+    end
+
+    def screen_move_to_bottom
+      puts "\033[22B"
+    end
+
   private
-    def set_command(&block)
+    def set_command(command_name, &block)
       rails_reload!
+      @command_name = command_name
       @command_proc = block
       DRb.stop_service
     end
 
+    def argv_to_s
+      ARGV.map { |arg|
+        if arg.include?(" ")
+          "\"#{arg}\""
+        else
+          arg
+        end
+      }.join(' ')
+    end
+
+    def set_argv(argv)
+      ARGV.clear
+      ARGV.concat(argv)
+    end
+
     def rails_reload!
       ActionDispatch::Reloader.cleanup!
       ActionDispatch::Reloader.prepare!
     end
-  end
-end
-
-base_port = ARGV[0]
-worker_port = ARGV[1].to_i
 
-worker = Theine::Worker.new
+    def start_service
+      DRb.start_service("druby://localhost:#{@port}", self)
+    end
 
-balancer = DRbObject.new_with_uri("druby://localhost:#{base_port}")
-balancer.set_worker_pid(worker_port, worker.pid)
+    def boot
+      balancer.set_worker_pid(port, pid)
 
-worker.boot
-DRb.start_service("druby://localhost:#{worker_port}", worker)
-balancer.worker_boot(worker_port)
+      require "#{RAILS_ROOT_PATH}/config/boot"
+      require "#{RAILS_ROOT_PATH}/config/environment"
+      start_service
 
-begin
-  DRb.thread.join
-  worker.command_proc.call
-ensure
-  balancer.worker_done(worker_port)
+      balancer.worker_boot(port)
+    end
+  end
 end
+
+balancer = DRbObject.new_with_uri("druby://localhost:#{ARGV[0]}")
+worker = Theine::Worker.new(ARGV[1].to_i, balancer)
+
+worker.run

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: theine
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Jan Berdajs
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.4
 signing_key: 
 specification_version: 4
 summary: Theine