Skip to content

Ruby ~> 1.9 hash syntax #1535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Ruby ~> 1.9 hash syntax #1535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ end
desc "Create a new page in #{source_dir}/(filename)/index.#{new_page_ext}"
task :new_page, :filename do |t, args|
raise "### You haven't set anything up yet. First run `rake install` to set up an Octopress theme." unless File.directory?(source_dir)
args.with_defaults(:filename => 'new-page')
args.with_defaults(filename: 'new-page')
page_dir = [source_dir]
if args.filename.downcase =~ /(^.+\/)?(.+)/
filename, dot, extension = $2.rpartition('.').reject(&:empty?) # Get filename and extension
Expand Down Expand Up @@ -183,12 +183,12 @@ task :update_style, :theme do |t, args|
theme = args.theme || 'classic'
if File.directory?("sass.old")
puts "removed existing sass.old directory"
rm_r "sass.old", :secure=>true
rm_r "sass.old", secure: true
end
mv "sass", "sass.old"
puts "## Moved styles into sass.old/"
cp_r "#{themes_dir}/"+theme+"/sass/", "sass", :remove_destination=>true
cp_r "sass.old/custom/.", "sass/custom/", :remove_destination=>true
cp_r "#{themes_dir}/"+theme+"/sass/", "sass", remove_destination: true
cp_r "sass.old/custom/.", "sass/custom/", remove_destination: true
puts "## Updated Sass ##"
end

Expand All @@ -197,15 +197,15 @@ task :update_source, :theme do |t, args|
theme = args.theme || 'classic'
if File.directory?("#{source_dir}.old")
puts "## Removed existing #{source_dir}.old directory"
rm_r "#{source_dir}.old", :secure=>true
rm_r "#{source_dir}.old", secure: true
end
mkdir "#{source_dir}.old"
cp_r "#{source_dir}/.", "#{source_dir}.old"
puts "## Copied #{source_dir} into #{source_dir}.old/"
cp_r "#{themes_dir}/"+theme+"/source/.", source_dir, :remove_destination=>true
cp_r "#{source_dir}.old/_includes/custom/.", "#{source_dir}/_includes/custom/", :remove_destination=>true
cp_r "#{themes_dir}/"+theme+"/source/.", source_dir, remove_destination: true
cp_r "#{source_dir}.old/_includes/custom/.", "#{source_dir}/_includes/custom/", remove_destination: true
cp "#{source_dir}.old/favicon.png", source_dir
mv "#{source_dir}/index.html", "#{blog_index_dir}", :force=>true if blog_index_dir != source_dir
mv "#{source_dir}/index.html", "#{blog_index_dir}", force: true if blog_index_dir != source_dir
cp "#{source_dir}.old/index.html", source_dir if blog_index_dir != source_dir && File.exists?("#{source_dir}.old/index.html")
puts "## Updated #{source_dir} ##"
end
Expand All @@ -228,7 +228,7 @@ task :deploy do
end

desc "Generate website and deploy"
task :gen_deploy => [:integrate, :generate, :deploy] do
task gen_deploy: [:integrate, :generate, :deploy] do
end

desc "copy dot files for deployment"
Expand Down
2 changes: 1 addition & 1 deletion config.ru
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class SinatraStaticServer < Sinatra::Base
end

not_found do
send_file(File.join(File.dirname(__FILE__), 'public', '404.html'), {:status => 404})
send_file(File.join(File.dirname(__FILE__), 'public', '404.html'), {status: 404})
end

def send_sinatra_file(path, &missing_file_block)
Expand Down