forge-cli 0.0.14 → 0.0.15

data/lib/forge-cli/modules/base/post_hooks.rb

@@ -13,6 +13,7 @@ class ForgeCLI
       if RUBY_VERSION.match(/^1\.9/)
         gemfile_content = File.read(File.join(@app, 'Gemfile'))
         new_content = gemfile_content.gsub("gem 'capybara', '~> 2.0.0'", "gem 'capybara'")
+        new_content = gemfile_content.gsub("gem 'shoulda-matchers', '~> 2.0.0'", "gem 'shoulda-matchers'")
         new_content = new_content.gsub("gem 'forge-rad'", "gem 'forge-rad19'")
 
         File.open(File.join(@app, 'Gemfile'), 'w') do |f|

data/lib/forge-cli/version.rb

@@ -1,3 +1,3 @@
 class ForgeCLI
-  VERSION = '0.0.14'
+  VERSION = '0.0.15'
 end

data/lib/forge/Capfile

@@ -5,4 +5,11 @@ load 'lib/forge/recipes'
 
 Dir['vendor/gems/*/recipes/*.rb','vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
 
-load 'config/deploy' # remove this line to skip loading any of the default tasks
+if `git ls-files`.split($/).include?("config/secret_token.txt")
+  load 'config/deploy' # remove this line to skip loading any of the default tasks
+else
+  $stderr.puts "I'm sorry, #{`whoami`.strip.capitalize}.  I'm afraid I can't let you do that."
+  $stderr.puts "Run `rake forge:secret` and check in config/secret_token.txt first."
+
+  exit 2000
+end

data/lib/forge/Gemfile

@@ -18,7 +18,7 @@ group :test do
   gem 'capybara', '~> 2.0.0'
   gem 'rspec-rails', '>= 2.0.1'
   gem 'shoulda'
-  gem 'shoulda-matchers'
+  gem 'shoulda-matchers', '~> 2.0.0'
   gem 'spork', '~> 0.9.0.rc'
   gem 'zentest-without-autotest', '4.4.0'
 end

data/lib/forge/config/initializers/secret_token.rb

@@ -1,17 +1,10 @@
-module Forge3::SecretToken
-  LOCATION = if Rails.env.production?
-    "/var/apps/#{File.basename(Dir.pwd)}/shared/secret_token.txt"
-  else
-    'config/secret_token.txt'
-  end
+Forge3::Application.config.secret_token = begin
+  Rails.root.join("config/secret_token.txt").read
+rescue Errno::ENOENT
+  $stderr.puts "Couldn't find a static secret token.  Generating a temporary one..."
+  $stderr.puts "Next time, run: rake forge:secret"
 
-  begin
-    Forge3::Application.config.secret_token = File.read(LOCATION)
-  rescue Errno::ENOENT
-    $stderr.puts "WARNING: Couldn't find a secret token.  Generating one now..."
+  require 'digest/md5'
 
-    Forge3::Application.config.secret_token = SecureRandom.hex(64)
-
-    File.open(LOCATION, 'w') { |f| f.write(Forge3::Application.config.secret_token) }
-  end
+  Digest::MD5.hexdigest(`uname -a`)
 end

data/lib/forge/lib/tasks/forge.rake

@@ -144,4 +144,15 @@ namespace :forge do
   task :encode_notify => :environment do
     system "zencoder_fetcher -u http://localhost:3000/forge/videos/encode_notify #{Forge.config.videos.zencoder_api_key}"
   end
+
+  desc "Generate a static secret token"
+  task :secret => :environment do
+    require 'securerandom'
+
+    token = SecureRandom.hex(256)
+
+    Rails.root.join("config", "secret_token.txt").open("w") do |f|
+      f.write(token)
+    end
+  end
 end

metadata

@@ -1,120 +1,118 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: forge-cli
-version: !ruby/object:Gem::Version
-  version: 0.0.14
+version: !ruby/object:Gem::Version 
+  hash: 1
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 15
+  version: 0.0.15
 platform: ruby
-authors:
+authors: 
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-05-13 00:00:00 -04:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rdoc
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: aruba
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 3
+        - 2
+        - 13
         version: 3.2.13
-- !ruby/object:Gem::Dependency
-  name: rainbow
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rainbow
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: thor
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id006
 description: 
 email: sean@factore.ca
-executables:
+executables: 
 - forge
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.rdoc
-files:
+files: 
 - bin/forge
 - lib/forge/app/abilities/video_ability.rb
 - lib/forge/app/assets/javascripts/app.js
@@ -1460,34 +1458,44 @@ files:
 - lib/forge-cli/version.rb
 - lib/forge-cli.rb
 - README.rdoc
+has_rdoc: true
 homepage: http://factore.ca/forge-cms
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --title
 - forge-cli
 - --main
 - README.rdoc
 - -ri
-require_paths:
+require_paths: 
 - lib
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
-summary: ! 'Forge: A CMS for Rapid Application Development'
+summary: "Forge: A CMS for Rapid Application Development"
 test_files: []
+