chili_videos 0.2.1 → 0.2.2

data/Gemfile

@@ -5,12 +5,21 @@ gem 'delayed_job', '~> 2.0.4'
 gem 'hashie', '~> 1.0.0'
 gem 'friendly_id', '~> 3.2.1'
 
-group :development do
+group :development, :test do
+  gem "rails", "2.3.14"
+  gem "fastercsv"
+  gem "rubytree", "~> 0.5.2", :require => 'tree'
+  gem "sqlite3-ruby", "< 1.3", :require => "sqlite3"
+  gem "webrat"
+
   gem 'cucumber'
+  gem 'shoulda'
+  gem 'rspec', '~> 1.3'
   gem 'rspec-rails'
   gem 'redmine_plugin_support'
   gem 'autotest-rails', '~> 4.1.0'
   gem 'fakeweb'
   gem 'hoe', '~> 2.8.0'
+  gem 'hoe-git'
   gem 'ZenTest'
 end

data/Gemfile.lock

@@ -2,47 +2,71 @@ GEM
   remote: http://rubygems.org/
   specs:
     ZenTest (4.5.0)
-    autotest-rails (4.1.0)
-      ZenTest
-    babosa (0.3.2)
+    actionmailer (2.3.14)
+      actionpack (= 2.3.14)
+    actionpack (2.3.14)
+      activesupport (= 2.3.14)
+      rack (~> 1.1.0)
+    activerecord (2.3.14)
+      activesupport (= 2.3.14)
+    activeresource (2.3.14)
+      activesupport (= 2.3.14)
+    activesupport (2.3.14)
+    autotest-rails (4.1.1)
+      ZenTest (= 4.5)
+    babosa (0.3.5)
     builder (3.0.0)
     crack (0.1.8)
-    cucumber (0.10.0)
+    cucumber (1.1.3)
       builder (>= 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.3.2)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    daemons (1.1.0)
-    delayed_job (2.0.4)
-      daemons
-    diff-lcs (1.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.6.7)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.6)
+    daemons (1.0.10)
+    delayed_job (2.0.7)
+      activesupport (~> 2.0)
+      daemons (= 1.0.10)
+    diff-lcs (1.1.3)
     fakeweb (1.3.0)
+    fastercsv (1.5.4)
     friendly_id (3.2.1.1)
       babosa (~> 0.3.0)
-    gherkin (2.3.3)
-      json (~> 1.4.6)
+    gherkin (2.6.8)
+      json (>= 1.4.6)
     hashie (1.0.0)
     hoe (2.8.0)
       rake (>= 0.8.7)
-    httparty (0.7.4)
+    hoe-git (1.3.0)
+      hoe (>= 2.2.0)
+    httparty (0.7.8)
       crack (= 0.1.8)
-    json (1.4.6)
+    json (1.6.1)
+    nokogiri (1.5.0)
     rack (1.1.2)
-    rake (0.8.7)
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (2.3.14)
+      actionmailer (= 2.3.14)
+      actionpack (= 2.3.14)
+      activerecord (= 2.3.14)
+      activeresource (= 2.3.14)
+      activesupport (= 2.3.14)
+      rake (>= 0.8.3)
+    rake (0.9.2.2)
     redmine_plugin_support (0.0.4)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    rspec-rails (1.3.2)
+    rspec (1.3.2)
+    rspec-rails (1.3.4)
       rack (>= 1.0.0)
-      rspec (>= 1.3.0)
-    term-ansicolor (1.0.5)
+      rspec (~> 1.3.1)
+    rubytree (0.5.3)
+    shoulda (2.11.3)
+    sqlite3-ruby (1.2.5)
+    term-ansicolor (1.0.7)
+    webrat (0.7.3)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
 
 PLATFORMS
   ruby
@@ -53,9 +77,17 @@ DEPENDENCIES
   cucumber
   delayed_job (~> 2.0.4)
   fakeweb
+  fastercsv
   friendly_id (~> 3.2.1)
   hashie (~> 1.0.0)
   hoe (~> 2.8.0)
+  hoe-git
   httparty (~> 0.7.4)
+  rails (= 2.3.14)
   redmine_plugin_support
+  rspec (~> 1.3)
   rspec-rails
+  rubytree (~> 0.5.2)
+  shoulda
+  sqlite3-ruby (< 1.3)
+  webrat

data/History.txt

@@ -1,3 +1,8 @@
+== 0.2.2 2011-11-23
+
+* Fixed issues in supplied rake tasks for installing gem and
+  managing delayed_job daemon. [#11, #12]
+
 == 0.2.1 2011-08-18
 
 * Fixed missing link to edit a video's meta-data

data/Manifest.txt

@@ -11,6 +11,7 @@ app/helpers/videos_helper.rb
 app/models/assembly.rb
 app/models/assembly_observer.rb
 app/models/assembly_processor.rb
+app/models/encoding.rb
 app/models/video.rb
 app/views/settings/_settings.html.erb
 app/views/videos/edit.html.erb

data/README.md

@@ -102,7 +102,7 @@ Cycle your application server (mongrel, unicorn, etc)
 Start the delayed\_job daemon
 
 ```
-RAILS_ENV=production rake chili_videos:delayed_job ACTION=start
+RAILS_ENV=production rake "chili_videos:delayed_job[start]"
 ```
 
 ## UNINSTALL:
@@ -110,7 +110,7 @@ RAILS_ENV=production rake chili_videos:delayed_job ACTION=start
 Stop the delayed\_job daemon
 
 ```
-RAILS_ENV=production rake chili_videos:delayed_job ACTION=stop
+RAILS_ENV=production rake "chili_videos:delayed_job[stop]"
 ```
 
 Run the uninstall rake task (reverts migrations & uninstalls assets)

data/app/models/assembly.rb

@@ -1,6 +1,3 @@
-class Encoding < Hashie::Mash
-end
-
 class Assembly < ActiveRecord::Base
   unloadable
 

data/app/models/encoding.rb

@@ -0,0 +1,2 @@
+class Encoding < Hashie::Mash
+end

data/lib/chili_videos.rb

@@ -10,7 +10,7 @@ require 'chili_videos/config'
 module ChiliVideos
   extend self
 
-  VERSION = '0.2.1' unless defined?(ChiliVideos::VERSION)
+  VERSION = '0.2.2' unless defined?(ChiliVideos::VERSION)
 
   def configured?
     !Config.api_key.blank? && !Config.workflow.blank?

data/lib/tasks/chili_videos_tasks.rb

@@ -25,9 +25,11 @@ class ChiliVideosTasks < Rake::TaskLib
       end
 
       desc "Manage delayed_job...requires argument [ACTION=(#{VALID_DJ_ACTIONS.join('|')})]"
-      task :delayed_job, 'action' => [:environment] do |task, args|
+      task :delayed_job, [:action] => [:environment] do |task, args|
         unless(args[:action] && VALID_DJ_ACTIONS.include?(args[:action]))
-          puts "'ACTION' is a required parameter. Valid values are: #{VALID_DJ_ACTIONS.join(', ')}"
+          puts "No action specified!"
+          puts "\nUsage: rake \"#{task.name}[action]\" (Note the quotes, and include the brackets...)"
+          puts "Valid values for 'action' are: #{VALID_DJ_ACTIONS.join(', ')}."
           exit(1)
         end
 
@@ -39,7 +41,7 @@ class ChiliVideosTasks < Rake::TaskLib
       end
 
       task :migrate_db => [:environment] do
-        puts "Migrating chili_videos-#{ChiliVideos::VERSION}..."
+        puts "Migrating chili_videos..."
         ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
         ActiveRecord::Migrator.migrate(gem_db_migrate_dir, ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
         Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby

metadata

@@ -1,171 +1,148 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: chili_videos
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.2.2
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
 platform: ruby
-authors: 
+authors:
 - Tom Kersten
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
+cert_chain:
+- ! '-----BEGIN CERTIFICATE-----
+
   MIIDMDCCAhigAwIBAgIBADANBgkqhkiG9w0BAQUFADA+MQwwCgYDVQQDDAN0b20x
+
   GTAXBgoJkiaJk/IsZAEZFgl3aGl0ZXNwdXIxEzARBgoJkiaJk/IsZAEZFgNjb20w
+
   HhcNMTEwNDIyMDQzOTA5WhcNMTIwNDIxMDQzOTA5WjA+MQwwCgYDVQQDDAN0b20x
+
   GTAXBgoJkiaJk/IsZAEZFgl3aGl0ZXNwdXIxEzARBgoJkiaJk/IsZAEZFgNjb20w
+
   ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDpxozDQgVN/oZljGlI9opm
+
   CrhNVA/lsNiXZBUmjfQC5XRPYHzmluon2Zz4050ljODKX+b/tkz/WVZ6x7a+Lop2
+
   yCLLWLcHNgB10j3j3k6bM0l3cfCdCvzevE7Zgpw3o/bzazST5x0pNzurasS1ouQk
+
   x/2o9E6qqJRuB51khuZKnh+Ma52/I1KQaMJ4bW6NOgquFCEIum8MJJBJWEdGm4It
+
   vhS/daRe/ADkYlgWl1Y1k7LxuH+1VCx7zMFMe1E0CMJzhGf7zuMS0w+dqwbL5m3N
+
   MLE8vgxwTEOsOwGz4wD6zMUdBY6FGYwRk8LGjvlokn0pZ1jyWHWSg2bUv/1GC2i9
+
   AgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBTN61Az
+
   ykDYheRHtzsjwE7fiLhYmzANBgkqhkiG9w0BAQUFAAOCAQEALwoInWubJXJYVH2N
+
   XnCMT4YlxNsQoYdDSxEagNOmZjK2eKtju0V9GjZAnyYB2q2LLilvbMyVtg/6AN0I
+
   XhCjyYZRRCADyvFGV4aBVv7yjKFQrIyXy8JT1iXxHC1N2o1DJlZUltCYNozJBhsO
+
   VNbnSqe8YYcezsuQ2/w9iavWXCf91QPwnrfHPZTrFPOveskJctm8HinF41fKwG5B
+
   iUHy8qVWGBCpDFYz6Kz+JtigaICcm2D4/WGLsDVOmgJ+g4xoOiCe9ZEkda8K+l/F
+
   yXWqInRlFIlTuwFTxj26jauBoskBPoz5bfkZFjaVRhyUnRnGka66lvcDOGfkRZWQ
+
   NVADJA==
+
   -----END CERTIFICATE-----
 
-date: 2011-08-18 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+'
+date: 2011-11-24 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: httparty
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152754240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 7
-        - 4
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.7.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: daemon-spawn
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2152754240
+- !ruby/object:Gem::Dependency
+  name: daemon-spawn
+  requirement: &2152753440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 4
-        - 2
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.4.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: delayed_job
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2152753440
+- !ruby/object:Gem::Dependency
+  name: delayed_job
+  requirement: &2152752760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 0
-        - 4
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 2.0.4
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: friendly_id
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2152752760
+- !ruby/object:Gem::Dependency
+  name: friendly_id
+  requirement: &2152752280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 105
-        segments: 
-        - 3
-        - 2
-        - 1
-        - 1
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 3.2.1.1
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: hashie
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2152752280
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: &2152751560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2152751560
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &2152750900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2152750900
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &2152749960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 8
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
-  version_requirements: *id007
-description: |-
-  ChiliProject/Redmine plugin which integrates with [Transload.it](http://transload.it)
-  to offer a private "YouTube-like" setup to your project site.
-email: 
+  prerelease: false
+  version_requirements: *2152749960
+description: ! 'ChiliProject/Redmine plugin which integrates with [Transload.it](http://transload.it)
+
+  to offer a private "YouTube-like" setup to your project site.'
+email:
 - tom@whitespur.com
-executables: 
+executables:
 - delayed_job
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.md
 - LICENSE
-files: 
+files:
 - .autotest
 - Gemfile
 - Gemfile.lock
@@ -179,6 +156,7 @@ files:
 - app/models/assembly.rb
 - app/models/assembly_observer.rb
 - app/models/assembly_processor.rb
+- app/models/encoding.rb
 - app/models/video.rb
 - app/views/settings/_settings.html.erb
 - app/views/videos/edit.html.erb
@@ -231,37 +209,34 @@ files:
 - test/unit/video_test.rb
 homepage: http://github.com/tomkersten/chili_videos
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2279180856632023053
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: chili_videos
-rubygems_version: 1.8.8
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: ChiliProject (/Redmine) plugin which adds self-hosted videos transcoded using the Transload.it service. The plugin a 'Video' tab to a project site which contains any associated videos.
-test_files: 
+summary: ChiliProject (/Redmine) plugin which adds self-hosted videos transcoded using
+  the Transload.it service. The plugin a 'Video' tab to a project site which contains
+  any associated videos.
+test_files:
 - test/test_helper.rb