dynosaur 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4143dd8410c842565956f544fca8c5edcfc2752c
-  data.tar.gz: 4d24ef4ccbc6a6fe6742da89b1f39585f7c0759f
+  metadata.gz: 1448d342f89404da10452e0e95176627f5c7ed56
+  data.tar.gz: ffe0d95b07ad64c410d89e4645289faa107c7cf5
 SHA512:
-  metadata.gz: c153e19d0bdeea037f565d44a2bec05d8c2e8911eb2c4e73f39ca53ec9ba73d12bf1b4c6f795705eb11d48c635a503d567ad84988e5c2350f14b1de45ed26975
-  data.tar.gz: f7257bd138dc326167639de8665e018bc2d216b9c2746c268b8d41a530abbb781cbbc11d874467cb2e4e0966635e979fc4beb28ba7cc3bc5ee3031c66973cb75
+  metadata.gz: 06a80b1d43a568785eee94acab44b02a260d4a61e83bd2502886ab2abd1dc0c2c9bf647b37b8a23ddec22a260455024a66ffd4192df89fdb7139af767387cfce
+  data.tar.gz: f0d630594d61500d65d7eafa207c33c36ac622d5af7f89fd63ebb0d7c6dda2649aa7ca20a1c65bcd198f92acf8bb4b4aaeaa2ad20bea3e9ff3593ffd0e18c030

data/README.md

@@ -35,6 +35,13 @@ local_process.start
 # => 48345
 ```
 
+You can also check to see if a similar rake task is already running before starting
+the task (e.g. if you want at most one instance of that task running concurrently)
+
+```ruby
+dyno = Dynosaur::Process::Heroku.new(task: 'session:destroy', args: [2500])
+dyno.start unless dyno.running?
+```
 
 ## Development
 

data/Rakefile

@@ -5,22 +5,3 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec
-
-task :echo, [:arg1, :arg2] do |_task, args|
-  puts %Q(ARG1: "#{args[:arg1]}")
-  puts %Q(ARG2: "#{args[:arg2]}")
-end
-
-task :sleep, [:duration] do |_task, args|
-  File.open('/tmp/sleep', 'w') do |file|
-    file.puts "Sleeping"
-    args[:duration].to_i.times do
-      sleep(1)
-      file.print('.')
-      file.flush
-    end
-    file.print("\n")
-    file.puts "Awake"
-    file.flush
-  end
-end

data/lib/dynosaur/process/heroku/finder.rb

@@ -0,0 +1,34 @@
+# Detects if a running dyno is currently executing the rake command
+module Dynosaur
+  class Process
+    class Heroku
+      class Finder
+        def initialize(rake_command:, client: Client::HerokuClient.client)
+          @rake_command = rake_command
+          @client = client
+        end
+
+        def exists?
+          one_off_dynos.any? do |dyno|
+            Utils::RakeCommand.valid?(dyno.command) &&
+              Utils::RakeCommand.parse(dyno.command) == rake_command
+          end
+        end
+
+        private
+
+        attr_reader :rake_command, :client
+
+        # @return [Array] Object instances, which respond to #command, for all
+        #   locally one off dynos
+        def one_off_dynos
+          app_name = Dynosaur::Client::HerokuClient.app_name
+          dynos = client.dyno.list(app_name).map do |response|
+            Struct.new(:type, :command).new(response['type'], response['command'])
+          end
+          dynos.select { |dyno| dyno.type == 'run' }
+        end
+      end
+    end
+  end
+end

data/lib/dynosaur/process/heroku.rb

@@ -1,7 +1,5 @@
 require 'dynosaur/client/heroku_client'
 
-require_relative '../process'
-
 # Start a detached rake task on a one-off dyno
 module Dynosaur
   class Process
@@ -23,10 +21,10 @@ module Dynosaur
 
       def start
         app_name = Dynosaur::Client::HerokuClient.app_name
-        dyno_accessor = Dynosaur::Client::HerokuClient.client.dyno
-        create_opts = { command: rake_command, attach: false }
+        client = Dynosaur::Client::HerokuClient.client
+        create_opts = { command: rake_command.to_s, attach: false }
         create_opts[:size] = size if size
-        response = dyno_accessor.create(app_name, create_opts)
+        response = client.dyno.create(app_name, create_opts)
         response['name']
       end
 

data/lib/dynosaur/process/local/finder.rb

@@ -0,0 +1,23 @@
+# Detects if a running process is currently executing the rake command
+module Dynosaur
+  class Process
+    class Local
+      class Finder
+        def initialize(rake_command:)
+          @rake_command = rake_command
+        end
+
+        def exists?
+          Utils::OS.structured_ps.any? do |process|
+            Utils::RakeCommand.valid?(process.command) &&
+              Utils::RakeCommand.parse(process.command) == rake_command
+          end
+        end
+
+        private
+
+        attr_reader :rake_command
+      end
+    end
+  end
+end

data/lib/dynosaur/process/local.rb

@@ -1,10 +1,9 @@
-require_relative '../process'
-
+# Start the rake task in a local process
 module Dynosaur
   class Process
     class Local < Process
       def start
-        pid = ::Process.spawn(rake_command)
+        pid = ::Process.spawn(rake_command.to_s)
         ::Process.detach(pid)
         pid
       end

data/lib/dynosaur/process.rb

@@ -3,29 +3,26 @@ require 'shellwords'
 module Dynosaur
   class Process
     def initialize(task:, args: [], opts: {})
-      @task = task
-      @args = args
+      @rake_command = Utils::RakeCommand.new(task: task, args: args)
       after_initialize(opts)
     end
 
+    def running?
+      klass = self.class.const_get('Finder')
+      finder = klass.new(rake_command: rake_command)
+      finder.exists?
+    end
+
     def start
       fail NotImplementedError, 'This method must be implemented in a subclass'
     end
 
     private
 
-    attr_reader :args, :task
+    attr_reader :rake_command
 
     def after_initialize(opts)
       # Do nothing so subclasses don't have to override if they want a no-op
     end
-
-    def rake_command
-      formatted_args = args.map do |arg|
-        arg.is_a?(String) ? arg.shellescape : arg
-      end.join(',')
-      task_with_args = args.empty? ? task : "#{task}[#{formatted_args}]"
-      "rake #{task_with_args} --trace"
-    end
   end
 end

data/lib/dynosaur/utils/os.rb

@@ -0,0 +1,24 @@
+# Utility methods for interacting with the underlying OS
+module Dynosaur
+  module Utils
+    module OS
+      class << self
+        # @return [Array] Object instances, which respond to #command, for all
+        #   locally running processes returned by the ps command
+        def structured_ps
+          ps_array = command_ps.split("\n").map(&:strip)
+          ps_array.shift # Remove the header row
+          ps_array.map do |command|
+            Struct.new(:command).new(command)
+          end
+        end
+
+        private
+
+        def command_ps
+          `ps -o command`
+        end
+      end
+    end
+  end
+end

data/lib/dynosaur/utils/rake_command.rb

@@ -0,0 +1,45 @@
+# Utility methods for generating and parsing rake command
+module Dynosaur
+  module Utils
+    class RakeCommand
+      PARSE_REGEX = /\brake\s+([\w:]+)(\[.*\])?/
+
+      attr_reader :task, :args
+
+      # @param command [String] the command to test for validity
+      # @return [true|false] true iff the string is a valid rake command
+      def self.valid?(command)
+        !(command =~ PARSE_REGEX).nil?
+      end
+
+      # @param command [String] the command to parse
+      # @return [RakeCommand] an instance that represents the command being parsed
+      # @raise [ArgumentError] if the command is not a valid rake command
+      def self.parse(command)
+        match = command.match(PARSE_REGEX)
+        raise ArgumentError, %Q(Invalid rake command: "#{command}") unless match
+        task = match[1]
+        args = match[2] ? match[2].tr('[]', '').split(',') : []
+        new(task: task, args: args)
+      end
+
+      def initialize(task:, args: [])
+        @task = task
+        @args = args
+      end
+
+      # @return [String] the full rake command, including arguments
+      def to_s
+        formatted_args = args.map do |arg|
+          arg.is_a?(String) ? arg.shellescape : arg
+        end.join(',')
+        task_with_args = args.empty? ? task : "#{task}[#{formatted_args}]"
+        "rake #{task_with_args} --trace"
+      end
+
+      def ==(other)
+        task == other.task && args.map(&:to_s) == other.args.map(&:to_s)
+      end
+    end
+  end
+end

data/lib/dynosaur/version.rb

@@ -1,4 +1,4 @@
 # Gem version number
 module Dynosaur
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/dynosaur.rb

@@ -1,6 +1,13 @@
 require 'dynosaur/version'
+
+require 'dynosaur/process'
 require 'dynosaur/process/heroku'
+require 'dynosaur/process/heroku/finder'
 require 'dynosaur/process/local'
+require 'dynosaur/process/local/finder'
+
+require 'dynosaur/utils/os'
+require 'dynosaur/utils/rake_command'
 
 # Spin up a rake task in a separate process
 module Dynosaur

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynosaur
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tom Collier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: platform-api
@@ -117,7 +117,11 @@ files:
 - lib/dynosaur/client/heroku_client.rb
 - lib/dynosaur/process.rb
 - lib/dynosaur/process/heroku.rb
+- lib/dynosaur/process/heroku/finder.rb
 - lib/dynosaur/process/local.rb
+- lib/dynosaur/process/local/finder.rb
+- lib/dynosaur/utils/os.rb
+- lib/dynosaur/utils/rake_command.rb
 - lib/dynosaur/version.rb
 homepage: 
 licenses: