Skip to content

Commit

Permalink
Merge pull request #7 from furunkel/naming_conventions
Browse files Browse the repository at this point in the history
Comply with RubyGems naming conventions
  • Loading branch information
yasuhito committed Sep 24, 2013
2 parents 97c9cbc + 21d9bec commit 67d821b
Show file tree
Hide file tree
Showing 36 changed files with 46 additions and 46 deletions.
6 changes: 3 additions & 3 deletions Guardfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ end


guard :rspec, :cli => "--color -r rspec/instafail -f RSpec::Instafail", :all_on_start => false do
watch(%r{^spec/paper-house/.+_spec\.rb$})
watch(%r{^lib/paper-house/(.+)\.rb$}) { |m| "spec/paper-house/#{m[1]}_spec.rb" }
watch(%r{^spec/paper_house/.+_spec\.rb$})
watch(%r{^lib/paper_house/(.+)\.rb$}) { |m| "spec/paper_house/#{m[1]}_spec.rb" }
watch('spec/spec_helper.rb') { "spec" }
end


require "paper-house/platform"
require "paper_house/platform"

cli_opts = %w(--format progress --strict --profile) + [ PaperHouse::Platform::MAC ? "mac" : "linux" ]

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ and `*.h` files in the current directory, just add the following lines
to your `Rakefile`.

```ruby
require "paper-house"
require "paper_house"

PaperHouse::ExecutableTask.new :hello
```
Expand Down Expand Up @@ -73,7 +73,7 @@ The simplest way to install Paper House is to use [Bundler](http://gembundler.co
Add Paper House to your `Gemfile`:

```ruby
gem 'paper-house'
gem 'paper_house'
```

and install it by running Bundler:
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ end
require "cucumber/rake/task"
Cucumber::Rake::Task.new do | t |
profile = %w(--profile)
require "paper-house/platform"
require "paper_house/platform"
if PaperHouse::Platform::MAC
profile << "mac"
else
Expand Down
2 changes: 1 addition & 1 deletion examples/c_extension/Rakefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
require "paper-house"
require "paper_house"

PaperHouse::CExtensionTask.new :hello
2 changes: 1 addition & 1 deletion examples/c_extension/Rakefile.llvm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "paper-house"
require "paper_house"

PaperHouse::CExtensionTask.new :hello do | task |
task.cc = "llvm-gcc"
Expand Down
2 changes: 1 addition & 1 deletion examples/executable/Rakefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
require "paper-house"
require "paper_house"

PaperHouse::ExecutableTask.new :hello
2 changes: 1 addition & 1 deletion examples/executable/Rakefile.llvm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "paper-house"
require "paper_house"

PaperHouse::ExecutableTask.new :hello do | task |
task.cc = "llvm-gcc"
Expand Down
2 changes: 1 addition & 1 deletion examples/executable_subdirs/Rakefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "paper-house"
require "paper_house"

PaperHouse::ExecutableTask.new :hello do | task |
task.executable_name = "hello"
Expand Down
2 changes: 1 addition & 1 deletion examples/shared_library/Rakefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "paper-house"
require "paper_house"

$libhello = PaperHouse::SharedLibraryTask.new :libhello do | task |
task.version = "0.1.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/shared_library/Rakefile.llvm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "paper-house"
require "paper_house"

$libhello = PaperHouse::SharedLibraryTask.new :libhello do | task |
task.version = "0.1.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/shared_library_subdirs/Rakefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "paper-house"
require "paper_house"

libhello = PaperHouse::SharedLibraryTask.new :libhello do | task |
task.library_name = "hello"
Expand Down
2 changes: 1 addition & 1 deletion examples/static_library/Rakefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "paper-house"
require "paper_house"

task :hello => :libhello

Expand Down
2 changes: 1 addition & 1 deletion examples/static_library/Rakefile.llvm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "paper-house"
require "paper_house"

task :hello => :libhello

Expand Down
2 changes: 1 addition & 1 deletion examples/static_library_subdirs/Rakefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "paper-house"
require "paper_house"

task :hello => :libhello

Expand Down
10 changes: 5 additions & 5 deletions lib/paper-house.rb → lib/paper_house.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
#


require "paper-house/c-extension-task"
require "paper-house/executable-task"
require "paper-house/shared-library-task"
require "paper-house/static-library-task"
require "paper-house/version"
require "paper_house/c_extension_task"
require "paper_house/executable_task"
require "paper_house/shared_library_task"
require "paper_house/static_library_task"
require "paper_house/version"


### Local variables:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#


require "paper-house/safe-popen"
require "paper_house/safe_popen"


module PaperHouse
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
#


require "paper-house/auto-depends"
require "paper-house/dependency"
require "paper-house/cc-options"
require "paper_house/auto_depends"
require "paper_house/dependency"
require "paper_house/cc_options"
require "rake/clean"
require "rake/tasklib"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
#


require "paper-house/library-task"
require "paper-house/linker-options"
require "paper-house/platform"
require "paper_house/library_task"
require "paper_house/linker_options"
require "paper_house/platform"


module PaperHouse
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
#


require "paper-house/build-task"
require "paper-house/linker-options"
require "paper-house/shared-library-task"
require "paper-house/static-library-task"
require "paper_house/build_task"
require "paper_house/linker_options"
require "paper_house/shared_library_task"
require "paper_house/static_library_task"


module PaperHouse
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#


require "paper-house/build-task"
require "paper_house/build_task"


module PaperHouse
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
#


require "paper-house/library-task"
require "paper-house/linker-options"
require "paper-house/platform"
require "paper_house/library_task"
require "paper_house/linker_options"
require "paper_house/platform"


module PaperHouse
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#


require "paper-house/library-task"
require "paper_house/library_task"


module PaperHouse
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions paper-house.gemspec → paper_house.gemspec
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
lib = File.expand_path( "../lib", __FILE__ )
$LOAD_PATH.unshift( lib ) unless $LOAD_PATH.include?( lib )
require "paper-house/version"
require "paper_house/version"


Gem::Specification.new do | gem |
gem.name = "paper-house"
gem.name = "paper_house"
gem.version = PaperHouse::VERSION
gem.summary = "Rake for C projects."
gem.description = "Rake tasks for compiling C projects."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#


require "paper-house/c-extension-task"
require "paper_house/c_extension_task"


module PaperHouse
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#


require "paper-house/cc-options"
require "paper_house/cc_options"


module PaperHouse
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#


require "paper-house/executable-task"
require "paper_house/executable_task"


module PaperHouse
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#


require "paper-house/shared-library-task"
require "paper_house/shared_library_task"


module PaperHouse
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#


require "paper-house/static-library-task"
require "paper_house/static_library_task"


module PaperHouse
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#


require "paper-house/version"
require "paper_house/version"


describe PaperHouse do
Expand Down

0 comments on commit 67d821b

Please sign in to comment.