forge-cli 0.1.5 → 0.1.6

data/lib/forge/spec/controllers/forge/videos_controller_spec.rb

@@ -8,7 +8,7 @@ describe Forge::VideosController do
   describe "As an admin" do
     fixtures :users, :roles
     before do
-      controller.stub!(:current_user).and_return(users(:admin))
+      controller.stub(:current_user).and_return(users(:admin))
 
     end
 
@@ -54,7 +54,7 @@ describe Forge::VideosController do
       describe "with valid attributes" do
         before do
           @video = mock_model(Video, :save => true)
-          Video.stub!(:new).and_return(@video)
+          Video.stub(:new).and_return(@video)
         end
 
         it "should assign @video" do
@@ -81,7 +81,7 @@ describe Forge::VideosController do
       describe "with invalid attributes" do
         before do
           @video = mock_model(Video, :save => false)
-          Video.stub!(:new).and_return(@video)
+          Video.stub(:new).and_return(@video)
         end
 
         it "should assign @video" do
@@ -115,7 +115,7 @@ describe Forge::VideosController do
       describe "with valid params" do
         before(:each) do
           @video = mock_model(Video, :update_attributes => true)
-          Video.stub!(:find).with("1").and_return(@video)
+          Video.stub(:find).with("1").and_return(@video)
         end
 
         it "should find video and return object" do
@@ -137,7 +137,7 @@ describe Forge::VideosController do
       describe "with invalid params" do
         before(:each) do
           @video = mock_model(Video, :update_attributes => false)
-          Video.stub!(:find).with("1").and_return(@video)
+          Video.stub(:find).with("1").and_return(@video)
         end
 
         it "should find video and return object" do
@@ -167,7 +167,7 @@ describe Forge::VideosController do
     describe "DELETE /videos/:id" do
       it "should delete" do
         @video = mock_model(Video)
-        Video.stub!(:find).and_return(@video)
+        Video.stub(:find).and_return(@video)
         @video.should_receive(:destroy)
         delete :destroy, :id => 1
       end
@@ -181,8 +181,8 @@ describe Forge::VideosController do
 
       before do
         @video = mock_model(Video)
-        Video.stub!(:find).and_return(@video)
-        @video.stub!(:encode).and_return(mock('response', :success? => true))
+        Video.stub(:find).and_return(@video)
+        @video.stub(:encode).and_return(mock('response', :success? => true))
       end
 
       it "should receive encode" do
@@ -206,7 +206,7 @@ describe Forge::VideosController do
 
   describe "As someone who's not logged in" do
     before do
-      controller.stub!(:current_user).and_return(nil)
+      controller.stub(:current_user).and_return(nil)
     end
 
     it "should not let you get the new action" do

data/lib/forge/spec/models/reorderable_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 class DummyClass
   include Forge::Reorderable
   attr_accessor :id, :list_order
-  
+
   def initialize(id)
     @id = id
   end
-  
+
   def save
     true
   end
@@ -16,9 +16,9 @@ end
 describe "Forge::Reorderable" do
   it "should set the list order on the correct item" do
     one, two, three = DummyClass.new(1), DummyClass.new(2), DummyClass.new(3)
-    DummyClass.stub!(:find_by_id).with(1).and_return(one)
-    DummyClass.stub!(:find_by_id).with(2).and_return(two)
-    DummyClass.stub!(:find_by_id).with(3).and_return(three)
+    DummyClass.stub(:find_by_id).with(1).and_return(one)
+    DummyClass.stub(:find_by_id).with(2).and_return(two)
+    DummyClass.stub(:find_by_id).with(3).and_return(three)
     DummyClass.reorder!([2, 1, 3])
     [one.list_order, two.list_order, three.list_order].should == [1, 0, 2]
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forge-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - factor[e] design initiative
@@ -14,42 +14,42 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -70,28 +70,28 @@ dependencies:
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -102,7 +102,19 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- bin/cucumber
+- bin/erubis
 - bin/forge
+- bin/htmldiff
+- bin/ldiff
+- bin/rackup
+- bin/rake
+- bin/rdoc
+- bin/ri
+- bin/sprockets
+- bin/thor
+- bin/tilt
+- bin/tt
 - lib/forge/app/abilities/video_ability.rb
 - lib/forge/app/assets/javascripts/app.js
 - lib/forge/app/assets/javascripts/application.js
@@ -557,10 +569,7 @@ files:
 - lib/forge/Capfile
 - lib/forge/config/application.rb
 - lib/forge/config/boot.rb
-- lib/forge/config/database.yml
 - lib/forge/config/database.yml.template
-- lib/forge/config/deploy.rb
-- lib/forge/config/dispatch_daemon.yml
 - lib/forge/config/environment.rb
 - lib/forge/config/environments/development.rb
 - lib/forge/config/environments/production.rb
@@ -582,7 +591,6 @@ files:
 - lib/forge/config/locales/devise.en.yml
 - lib/forge/config/locales/en.yml
 - lib/forge/config/routes.rb
-- lib/forge/config/s3.yml
 - lib/forge/config/s3.yml.template
 - lib/forge/config/settings.yml
 - lib/forge/config/settings.yml.template
@@ -621,6 +629,10 @@ files:
 - lib/forge/doc/i18n.md
 - lib/forge/doc/README_FOR_APP
 - lib/forge/doc/update_to_rails4_notes.md
+- lib/forge/features/authentication.feature
+- lib/forge/features/step_definitions/web_steps.rb
+- lib/forge/features/support/env.rb
+- lib/forge/features/support/paths.rb
 - lib/forge/Gemfile
 - lib/forge/Gemfile.lock
 - lib/forge/Guardfile
@@ -801,7 +813,6 @@ files:
 - lib/forge/lib/recipes/aaf_recipes.rb
 - lib/forge/lib/tasks/forge.rake
 - lib/forge/lib/templates/active_record/model/model.rb
-- lib/forge/log/development.log
 - lib/forge/public/404.html
 - lib/forge/public/422.html
 - lib/forge/public/500.html
@@ -814,7 +825,6 @@ files:
 - lib/forge/public/robots.txt
 - lib/forge/Rakefile
 - lib/forge/script/delayed_job
-- lib/forge/script/dispatch_daemon_fetcher
 - lib/forge/script/ferret_server
 - lib/forge/script/rails
 - lib/forge/spec/controllers/contact_controller_spec.rb
@@ -983,18 +993,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: ! 'Forge: A CMS for Rapid Application Development'
+summary: 'Forge: A CMS for Rapid Application Development'
 test_files: []

data/lib/forge/config/database.yml

@@ -1,24 +0,0 @@
-# SQLite version 3.x
-#   gem install sqlite3-ruby (not necessary on OS X Leopard)
-development:
-  adapter: postgresql
-  encoding: utf8
-  database: forge4_development
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  adapter: postgresql
-  encoding: utf8
-  database: forge4_test
-
-production:
-  adapter: mysql2
-  encoding: utf8
-  reconnect: true
-  database: _production
-  pool: 5
-  username: 
-  password: 
-  host: 10.200.113.226

data/lib/forge/config/deploy.rb

@@ -1,53 +0,0 @@
-default_run_options[:pty] = true
-default_run_options[:shell] = '/bin/bash --login'
-
-set :application, "" # The name of the application
-set :repository,  "git@github.com:factore/#{application}.git" # Path to the github repo
-# set :repository,  "git@bitbucket.org:factore/#{application}.git" # Path to the bitbucket repo
-
-set :scm, "git"
-set :scm_passphrase, "9shwartz90005"
-set :user, "deploy"
-set :deploy_via, :remote_cache
-set :bundle_without, [:darwin, :development, :test, :linux]
-
-set :deploy_to, "/var/apps/#{application}"
-
-role :web, "metal1.factore.ca", "metal2.factore.ca"
-role :db, "metal1.factore.ca", :primary => true
-
-before("deploy:assets:precompile") { run "cd #{current_release}; cp config/database.yml.template config/database.yml" }
-# Uncomment this line if the app uses ferret_server
-# after("deploy:symlink") { run "chmod +rx #{current_path}/script/ferret_server" }
-after("deploy:restart", "deploy:expire_cache")
-
-# Clean up!
-set :use_sudo, false
-set :keep_releases, 2
-after "deploy", "deploy:cleanup"
-after "deploy:migrate", "deploy:cleanup"
-
-
-# Passenger Stuff and Cache Expiry
-namespace :deploy do
-  desc "Restarting mod_rails with restart.txt"
-  task :restart, :roles => :web, :except => { :no_release => true } do
-    run "touch #{current_path}/tmp/restart.txt"
-  end
-
-
-  [:start, :stop].each do |t|
-    desc "#{t} task is a no-op with mod_rails"
-    task t, :roles => :web do ; end
-  end
-
-  desc "Expire the cache"
-  task :expire_cache, :roles => :db do
-    run "cd /var/apps/#{application}/current; bundle exec rake forge:expire_cache RAILS_ENV=production;"
-  end
-
-  desc "Deploy Forge"
-  task :deploy_forge, :roles => :db do
-    run "cd #{current_release}; bundle exec rake forge:deploy RAILS_ENV=production PASSWORD=#{ENV['PASSWORD']}; bundle exec rake forge:load_help RAILS_ENV=production"
-  end
-end

data/lib/forge/config/dispatch_daemon.yml

@@ -1,23 +0,0 @@
-defaults: &defaults
-  type: pop                   # pop OR imap
-  server: pop.emailsrvr.com  # server hostname
-  port:                     # 993 for IMAPs
-  ssl: false                 # Remove if not using SSL
-  username: forgetest-ca@forgemail.ca                # Username
-  password: DdQhbTPE                # Password
-  receiver: DispatchMailer                # ActionMailer that will receive mail
-  use_login: true           # Required for GMAIL
-  sleep_time: 60              # Poll Frequency. 60 seconds by default
-  authentication:           # LOGIN, CRAM-MD5, PASSWORD (IMAP Only)
-
-development:
-  <<: *defaults
-  # Override other values here
-  
-test:
-  <<: *defaults
-  # Override other values here
-  
-production:
-  <<: *defaults
-  # Override other values here

data/lib/forge/config/s3.yml

@@ -1,19 +0,0 @@
-development:
-  bucket: forge3_development
-  access_key_id: AKIAI6K5OJBKKW2OCSBQ
-  secret_access_key: 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
-
-test:
-  bucket: forge3_test
-  access_key_id: AKIAI6K5OJBKKW2OCSBQ
-  secret_access_key: 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
-
-production:
-  bucket: forge3_production
-  access_key_id: AKIAI6K5OJBKKW2OCSBQ
-  secret_access_key: 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
-
-encoded:
-  bucket: forge3_encoded
-  access_key_id: AKIAI6K5OJBKKW2OCSBQ
-  secret_access_key: 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

data/lib/forge/log/development.log

@@ -1,2 +0,0 @@
-DEPRECATION WARNING: String based terminators are deprecated, please use a lambda. (called from define_paperclip_callbacks at /Users/adrianduyzer/www/forge/lib/forge/vendor/ruby/2.0.0/gems/paperclip-3.3.1/lib/paperclip/callbacks.rb:10)
-DEPRECATION WARNING: String based terminators are deprecated, please use a lambda. (called from define_paperclip_callbacks at /Users/adrianduyzer/www/forge/lib/forge/vendor/ruby/2.0.0/gems/paperclip-3.3.1/lib/paperclip/callbacks.rb:10)

data/lib/forge/script/dispatch_daemon_fetcher

@@ -1,28 +0,0 @@
-#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/environment.rb'
-require 'daemon'
-
-class DispatchDaemonFetcherDaemon < Daemon::Base
-  
-  @config = YAML.load_file("#{Rails.root}/config/dispatch_daemon.yml")
-  @config = @config[Rails.env].to_options
-  
-  @sleep_time = @config.delete(:sleep_time) || 60
-  def self.start
-    puts "Starting DispatchDaemonFetcherDaemon"
-    # Add your own receiver object below
-    @fetcher = Fetcher.create({:receiver => DispatchMailer}.merge(@config))
-
-    loop do
-      @fetcher.fetch
-      sleep(@sleep_time)
-    end
-  end
-  
-  def self.stop
-    puts "Stopping DispatchDaemonFetcherDaemon"
-  end
-  
-end
-
-DispatchDaemonFetcherDaemon.daemonize