staugaard-transcoding_machine 0.1.0 → 0.1.1

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 0
+:patch: 1
 :major: 0
 :minor: 1

data/lib/transcoding_machine/client/job_queue.rb

@@ -4,13 +4,12 @@ require 'transcoding_machine/server/s3_storage'
 module TranscodingMachine
   module Client
     class JobQueue
-      def initialize
-        @sqs = RightAws::SqsGen2.new
-      end
-
-      def push(queue_name, bucket, key, media_player_ids, result_queue_name)
-        msg = {:bucket => bucket, :key => key, :media_players => media_player_ids, :result_queue => result_queue_name}
-        @sqs.queue(queue_name).push(msg.to_yaml)
+      def self.push(queue_name, bucket, key, media_player_ids, result_queue_name, options = {})
+        options[:bucket] = bucket
+        options[:key] = key
+        options[:media_players] = media_player_ids
+        options[:result_queue] = result_queue_name
+        RightAws::SqsGen2.new.queue(queue_name).push(options.to_yaml)
       end
     end
   end

data/lib/transcoding_machine/client/result_queue.rb

@@ -33,7 +33,6 @@ module TranscodingMachine
     
     def consume_message(message, &block)
       message_properties = YAML.load(message.body)
-      puts "consuming message #{message_properties.inspect}"
       
       begin
         yield(message_properties)

data/lib/transcoding_machine/server/transcoding_event_listener.rb

@@ -21,7 +21,7 @@ module TranscodingMachine
       end
 
       def analyzed_source_file(source_file_attributes, source_media_format)
-        push_status(:analyzed, :media_format => source_media_format, :media_attributes => source_file_attributes)
+        push_status(:analyzed, :media_format => source_media_format.id, :media_attributes => source_file_attributes)
       end
 
       def generating_thumbnail_file
@@ -29,23 +29,23 @@ module TranscodingMachine
       end
 
       def generated_thumbnail_file
-
+        push_status(:created_thumbnail)
       end
 
       def transcoding(media_format)
-        push_status(:transcoding, :media_format => media_format)
+        push_status(:transcoding, :media_format => media_format.id)
       end
 
       def transcoded(media_format)
-        push_status(:transcoded, :media_format => media_format)
+        push_status(:transcoded, :media_format => media_format.id)
       end
 
       def putting_destination_file(file_path, media_format)
-        push_status(:uploading, :media_format => media_format, :destination_key => file_path)
+        push_status(:uploading, :media_format => media_format.id, :destination_key => file_path)
       end
 
       def put_destination_file(file_path, media_format)
-        push_status(:uploaded, :media_format => media_format, :destination_key => file_path)
+        push_status(:uploaded, :media_format => media_format.id, :destination_key => file_path)
       end
 
       def push_status(status, options = {})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: staugaard-transcoding_machine
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Mick Staugaard
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-03 00:00:00 -07:00
+date: 2009-04-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.10.0
+        version: 1.9.0
     version: 
 description: TODO
 email: mick@staugaard.com
@@ -61,7 +61,6 @@ files:
 - lib/transcoding_machine/client
 - lib/transcoding_machine/client/job_queue.rb
 - lib/transcoding_machine/client/result_queue.rb
-- lib/transcoding_machine/client/server_manager.rb
 - lib/transcoding_machine/media_format.rb
 - lib/transcoding_machine/media_format_criterium.rb
 - lib/transcoding_machine/media_player.rb

data/lib/transcoding_machine/client/server_manager.rb

@@ -1,107 +0,0 @@
-require 'right_aws'
-
-module TranscodingMachine
-  module Client
-    class ServerManager
-      
-      # Sets up a new ServerManager
-      # queue_settings are a in the following format:
-      # {'transcoding_job_queue' => {:ami => 'ami-e444444d',
-      #                              :location => 'us-east-1c',
-      #                              :key => 'my_awesome_key',
-      #                              :type => 'm1.large'}
-      # }
-      # 
-      # options are:
-      # * <tt>:sleep_time</tt> the time to sleep between queue checks (default 30)
-      # * <tt>:transcoding_settings</tt> a string or lambda with the userdata to send to new transcoding servers
-      # * <tt>:server_count</tt> a lambda returning the needed number of transcoding servers for a given queue (defaults to the queue size)
-      def initialize(queue_settings, options)
-        @sqs = RightAws::SqsGen2.new
-        @ec2 = RightAws::Ec2.new
-        
-        @queues = Hash.new
-        queue_settings.each do |queue_name, settings|
-          @queues[@sqs.queue(queue_name.to_s)] = settings
-        end
-        
-        @server_count = options[:server_count] || lambda {|queue| queue.size}
-        
-        @transcoding_settings = options[:transcoding_settings]
-        
-        @sleep_time = options[:sleep_time] || 20
-        
-        @running = false
-      end
-      
-      def needed_server_count(queue)
-        @server_count.call(queue)
-      end
-      
-      def transcoding_settings(queue)
-        "test"
-        #@transcoding_settings.respond_to?(:call) ? @transcoding_settings.call(queue) : @transcoding_settings
-      end
-      
-      def running_server_count(queue)
-        @ec2.describe_instances.find_all do |instance|
-          state = instance[:aws_state_code].to_i
-          zone = instance[:aws_availability_zone]
-          ami = instance[:aws_image_id]
-          
-          matches = state <= 16
-          matches &&= ami == ec2_ami(queue)
-          matches &&= zone == ec2_location(queue) if ec2_location(queue)
-          matches
-        end.size
-      end
-      
-      def ec2_ami(queue)
-        @queues[queue][:ami]
-      end
-
-      def ec2_location(queue)
-        @queues[queue][:location]
-      end
-      
-      def ec2_key(queue)
-        @queues[queue][:key]
-      end
-
-      def ec2_instance_type(queue)
-        @queues[queue][:type]
-      end
-      
-      def ec2_security_groups(queue)
-        @queues[queue][:security_groups]
-      end
-
-      def manage_servers(options = {})
-        @running = true
-        
-        while @running
-          @queues.keys.each do |queue|
-            needed = needed_server_count(queue)
-            running = running_server_count(queue)
-            
-            #if needed > 0 || running > 0
-              puts "#{running} of #{needed} needed servers are running for queue #{queue.name}"
-            #end
-            
-            if running < needed
-              puts "requesting #{needed - running} new servers for queue #{queue.name}"
-              puts [ec2_ami(queue), 1, needed - running, ec2_security_groups(queue),
-                                               ec2_key(queue), transcoding_settings(queue),
-                                               nil, ec2_instance_type(queue), nil, nil, ec2_location(queue)].inspect
-                                               
-              new_servers = @ec2.run_instances(ec2_ami(queue), 1, needed - running, ec2_security_groups(queue),
-                                               ec2_key(queue), transcoding_settings(queue),
-                                               nil, ec2_instance_type(queue), nil, nil, ec2_location(queue))
-            end
-          end
-          sleep(@sleep_time)
-        end
-      end
-    end
-  end
-end