vj-sdk 0.4.3 → 0.5.0

data/.gitignore

@@ -2,4 +2,5 @@ log/*
 core-fixtures.yml
 pkg/*
 .DS_Store
-*.tmproj
+*.tmproj
+.bundle

data/Gemfile

@@ -0,0 +1,18 @@
+source :gemcutter
+
+# http://github.com/carlhuda/bundler/issues/#issue/107
+# - do not change unless lib/bundler_runtime_patch tested / defunct
+gem "bundler", "0.9.10"
+
+def gems(names, version)
+  names.each { |n| gem(n, version) }
+end
+
+# DataObjects, DataMapper and Merb
+gem "merb-core", "1.1.0.pre"
+gem "jeweler", ">= 1.4.0"
+gem "rake", ">= 0.8.7"
+gem "rspec", ">= 1.3.0"
+gem "mash"
+gem "randexp"
+gem "ruby-hmac"

data/Rakefile

@@ -1,6 +1,10 @@
 require 'rubygems'
-require 'merb-core'
-require 'rake'
+require 'bundler'
+require 'net/http'
+
+# BUNDLER TRANSFORM!
+require 'lib/bundler_runtime_patch' # Andre's OMG MEGA HAX to allow DataMapper to require successfully
+Bundler.require :default, :vj_core_dependencies
 
 begin
   require 'jeweler'
@@ -28,10 +32,7 @@ end
 
 namespace :spec do
   task :sdk do
-    require 'tasks/vj-core'
-    Rake::Task["videojuicer:core:setup"].invoke
     Rake::Task["spec"].execute
-    Rake::Task["videojuicer:core:cleanup"].invoke
   end
 end
 task :default => :"spec:sdk"

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
-:minor: 4
-:patch: 3
+:build: 
 :major: 0
+:minor: 5
+:patch: 0

data/lib/bundler_runtime_patch.rb

@@ -0,0 +1,50 @@
+module Bundler
+  class Runtime
+    private
+    def autorequires_for_groups(*groups)
+      groups.map! { |g| g.to_sym }
+      autorequires = Hash.new { |h,k| h[k] = [] }
+    
+      # ----- PATCH -----
+    
+      # ORIGINAL METHOD - unfortunately inside out
+      # ordered_deps = []
+      # specs_for(*groups).each do |g|
+      #   dep = @definition.dependencies.find{|d| d.name == g.name }        
+      #   ordered_deps << dep if dep && !ordered_deps.include?(dep)
+      # end
+    
+      # NEW METHOD
+      ordered_deps = []
+      spec_names = specs_for(*groups).map { |s| s.name }
+      @definition.dependencies.each do |dep|
+        ordered_deps << dep if spec_names.include?(dep.name) && !ordered_deps.include?(dep)
+      end
+
+      # DEBUG: verify that ordered_deps are in gem file specification order
+      # p ordered_deps.map { |d| d.name }
+    
+      # ----- /PATCH -----
+
+      ordered_deps.each do |dep|
+        dep.groups.each do |group|
+          # If there is no autorequire, then rescue from
+          # autorequiring the gems name
+          if dep.autorequire
+            dep.autorequire.each do |file|
+              autorequires[group] << [file, true]
+            end
+          else
+            autorequires[group] << [dep.name, false]
+          end
+        end
+      end
+
+      if groups.empty?
+        autorequires
+      else
+        groups.inject({}) { |h,g| h[g] = autorequires[g]; h }
+      end
+    end
+  end
+end

data/lib/videojuicer/asset/base.rb

@@ -22,6 +22,7 @@ module Videojuicer
         base.property :file,                File
         base.property :file_name,           String
         base.property :file_size,           Integer,  :writer => :private # bytes
+        base.property :source_uri,          String
         
         # - common metadata
         base.property :licensed_at,         Date
@@ -32,9 +33,13 @@ module Videojuicer
         # - access control / workflow
         base.property :url,                 String,   :writer => :private
         base.property :http_url,            String,   :writer => :private
+        
+        base.property :ingest_key,          String,   :writer => :private
         base.property :state,               String,   :writer => :private
         base.property :state_changed_at,    DateTime, :writer => :private
         base.property :state_changed_url,   String
+        base.property :state_location,      String,   :writer => :private
+        base.property :state_message,       String,   :writer => :private
         base.property :created_at,          DateTime
         base.property :updated_at,          DateTime
       end

data/spec/helpers/spec_helper.rb

@@ -41,11 +41,15 @@ module SpecHelper
   end
   
   def fixtures
-    fixture_path = File.join(File.dirname(__FILE__), "..", "..", "core-fixtures.yml")
+    fixture_path = File.join(core_path, "sdk_fixtures.yml")
     fixture_src = File.open(fixture_path).read
     @core_fixtures ||= Mash.new(YAML.load(fixture_src))
   end
   
+  def core_path
+    File.join(File.dirname(__FILE__), "..", "..", "..", "vj-core")
+  end
+  
 end
 
 Spec::Runner.configure do |config|

data/vj-sdk.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{vj-sdk}
-  s.version = "0.4.3"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["danski", "thejohnny", "knowtheory", "sixones", "btab"]
-  s.date = %q{2010-03-10}
+  s.date = %q{2010-04-22}
   s.email = %q{dan@videojuicer.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -17,15 +17,16 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "Gemfile",
      "LICENSE",
      "README.markdown",
      "Rakefile",
      "VERSION.yml",
+     "lib/bundler_runtime_patch.rb",
      "lib/core_ext/cgi.rb",
      "lib/core_ext/hash.rb",
      "lib/core_ext/object.rb",
      "lib/core_ext/string.rb",
-     "lib/sdk_connection_harness.rb",
      "lib/videojuicer.rb",
      "lib/videojuicer/asset/audio.rb",
      "lib/videojuicer/asset/base.rb",
@@ -105,7 +106,6 @@ Gem::Specification.new do |s|
      "spec/spec.opts",
      "spec/user_spec.rb",
      "spec/videojuicer_spec.rb",
-     "tasks/vj-core.rb",
      "vj-sdk.gemspec"
   ]
   s.homepage = %q{http://github.com/videojuicer/vj-sdk}
@@ -171,3 +171,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mash>, [">= 0.0.3"])
   end
 end
+

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 3
-  version: 0.4.3
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - danski
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-10 00:00:00 +00:00
+date: 2010-04-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,15 +73,16 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - .gitignore
+- Gemfile
 - LICENSE
 - README.markdown
 - Rakefile
 - VERSION.yml
+- lib/bundler_runtime_patch.rb
 - lib/core_ext/cgi.rb
 - lib/core_ext/hash.rb
 - lib/core_ext/object.rb
 - lib/core_ext/string.rb
-- lib/sdk_connection_harness.rb
 - lib/videojuicer.rb
 - lib/videojuicer/asset/audio.rb
 - lib/videojuicer/asset/base.rb
@@ -161,7 +162,6 @@ files:
 - spec/spec.opts
 - spec/user_spec.rb
 - spec/videojuicer_spec.rb
-- tasks/vj-core.rb
 - vj-sdk.gemspec
 has_rdoc: true
 homepage: http://github.com/videojuicer/vj-sdk

data/lib/sdk_connection_harness.rb

@@ -1,101 +0,0 @@
-begin
-  require 'extlib'
-rescue LoadError
-  require 'mash'
-end
-require 'yaml'
-class SDKConnectionHarness
-  class << self
-
-    attr_accessor :server_pid
-    attr_accessor :fixtures
-
-    def core_directory
-      File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "vj-core"))
-    end
-    
-    def start!
-      stop! if running?
-      puts "Starting vj-core from #{core_directory}\n"
-      Thread.new do
-        cur_dir = Dir.pwd
-        Dir.chdir(core_directory) do
-          `./bin/merb -d #{app_server} -p #{port} -e test --log ./log/sdk-development.log`
-        end
-        Dir.chdir(cur_dir)
-      end
-    end
-    
-    def stop!
-      Thread.new do
-        `killall -9 "merb : worker (port #{port})"`
-      end
-    end
-    
-    def running?
-      uri = URI.parse("http://localhost:#{port}/")
-      req = Net::HTTP::Get.new(uri.path)
-      
-      begin
-        resp = Net::HTTP.start(uri.host, uri.port) do |http|
-          http.request(req)
-        end
-        return true
-      rescue Exception => e
-        # Connection refused means the daemon isn't running
-        return false
-      end
-    end
-    
-    def load_fixtures
-      Dir.chdir(core_directory) do
-        out = `./bin/rake videojuicer:sdk:setup MERB_ENV=test`
-        out = out.match(/!!!([^!]+)!!!/m)
-        self.fixtures = out[1]
-      end
-    end
-    
-    def write_fixtures
-      f = File.open(File.join(File.dirname(__FILE__), "..", "core-fixtures.yml"), "w+")
-      f.rewind
-      f.write(self.fixtures)
-      f.close
-    end
-    
-    def app_server
-     begin
-       require 'thin'
-       adapter = 'thin'
-     rescue LoadError
-       adapter = 'mongrel'
-     end
-     return "--adapter #{adapter}"
-    end
-    
-    def port
-      6666
-    end
-    
-    def connect(overrides={})
-      fixtures = Mash.new(YAML.load(load_fixtures)).merge(overrides)
-      configure_test_settings(fixtures)
-      Videojuicer.enter_scope :seed_name => fixtures[:seed][:name], 
-                              :consumer_key=>fixtures["write-master"][:consumer][:consumer_key],
-                              :consumer_secret=>fixtures["write-master"][:consumer][:consumer_secret],
-                              :token=>fixtures["write-master"][:authorized_token][:oauth_token],
-                              :token_secret=>fixtures["write-master"][:authorized_token][:oauth_token_secret]
-    end
-    
-    def configure_test_settings(overrides={})
-      Videojuicer.configure!({
-        :consumer_key     => nil,
-        :consumer_secret  => nil,
-        :api_version      => 1,
-        :protocol         => "http",
-        :host             => "localhost",
-        :port             => port
-      }.merge(overrides))
-    end
-    
-  end
-end

data/tasks/vj-core.rb

@@ -1,72 +0,0 @@
-=begin
-
-  Prepares the vj-core development environment. Runs automatically before spec.
-
-=end
-
-require 'net/http'
-require File.join(File.dirname(__FILE__), "..", "lib", "sdk_connection_harness")
-
-namespace :videojuicer do  
-  namespace :core do
-    
-    task :setup do
-      Rake::Task['videojuicer:core:stop'].invoke
-      Rake::Task['videojuicer:core:load_fixtures'].invoke
-      Rake::Task['videojuicer:core:start'].invoke
-    end
-    
-    task :cleanup do
-      Rake::Task['videojuicer:core:stop'].invoke
-    end
-    
-    task :load_fixtures do
-      puts "Loading fixtures from vj-core..."
-      SDKConnectionHarness.load_fixtures
-      puts "Writing to tempfile..."
-      SDKConnectionHarness.write_fixtures
-    end
-    
-    task :start do
-      if SDKConnectionHarness.running?
-        puts "The SDK Test harness is already running on port #{SDKConnectionHarness.port}. Attempting to stop."
-        SDKConnectionHarness.stop!
-        until !SDKConnectionHarness.running? do
-          print "+"
-          sleep 1
-        end
-      else
-        SDKConnectionHarness.start!      
-        puts "Waiting for test harness to launch and open the port."
-        until SDKConnectionHarness.running? do
-          print "+"
-          sleep 1
-        end
-      end
-    end
-    
-    task :status do
-      puts( if SDKConnectionHarness.running?
-              "The test harness is RUNNING on port #{SDKConnectionHarness.port}"
-            else
-              "The test harness is NOT running on port #{SDKConnectionHarness.port}"
-            end
-          )
-    end
-    
-    task :stop do
-      if SDKConnectionHarness.running?
-        SDKConnectionHarness.stop!
-        puts "Waiting for exit"
-        while SDKConnectionHarness.running? do
-          print "."
-          sleep 1
-        end
-      else
-        puts "The test harness is not running."
-      end
-    end
-    
-  end
-end
-