paper_house 0.5.0 → 0.6.0

data/lib/paper_house/shared_library_task.rb

@@ -1,20 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2013 NEC Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License, version 3, as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
+# encoding: utf-8
 
 require 'paper_house/library_task'
 require 'paper_house/linker_options'
@@ -53,10 +37,6 @@ module PaperHouse
 
     private
 
-    def generate_target
-      sh(([cc] + cc_options).join(' '))
-    end
-
     def cc_options
       ['-shared', wl_option, o_option, objects, ldflags, l_options].flatten
     end
@@ -70,9 +50,3 @@ module PaperHouse
     end
   end
 end
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End:

data/lib/paper_house/static_library_task.rb

@@ -1,20 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2013 NEC Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License, version 3, as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
+# encoding: utf-8
 
 require 'paper_house/library_task'
 
@@ -40,7 +24,7 @@ module PaperHouse
     end
 
     def ar
-      sh "ar -cq #{target_path} #{objects.to_s}"
+      sh "ar -cq #{target_path} #{objects}"
     end
 
     def ranlib
@@ -48,9 +32,3 @@ module PaperHouse
     end
   end
 end
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End:

data/lib/paper_house/version.rb

@@ -1,29 +1,7 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2013 NEC Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License, version 3, as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
+# encoding: utf-8
 
 # Base module.
 module PaperHouse
   # gem version.
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8
-### indent-tabs-mode: nil
-### End:

data/lib/paper_house.rb

@@ -1,29 +1,7 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2013 NEC Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License, version 3, as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
+# encoding: utf-8
 
 require 'paper_house/executable_task'
 require 'paper_house/ruby_extension_task'
 require 'paper_house/shared_library_task'
 require 'paper_house/static_library_task'
 require 'paper_house/version'
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End:

data/paper_house.gemspec

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'paper_house/version'
@@ -14,19 +16,19 @@ Gem::Specification.new do |gem|
   gem.email = ['yasuhito@gmail.com']
   gem.homepage = 'http://github.com/trema/paper-house'
 
-  gem.files = `git ls-files`.split("\n")
+  gem.files = %w(CONTRIBUTING.md LICENSE Rakefile paper_house.gemspec)
+  gem.files += Dir.glob('lib/**/*.rb')
+  gem.files += Dir.glob('bin/**/*')
+  gem.files += Dir.glob('spec/**/*')
+  gem.files += Dir.glob('features/**/*')
 
   gem.require_paths = ['lib']
 
   gem.extra_rdoc_files = ['README.md']
-  gem.test_files = `git ls-files -- {spec,features}/*`.split("\n")
+  gem.test_files = Dir.glob('spec/**/*')
+  gem.test_files += Dir.glob('features/**/*')
 
+  gem.required_ruby_version = '>= 1.9.3'
   gem.add_dependency 'POpen4', '~> 0.1.4'
-  gem.add_dependency 'rake', '~> 10.1.0'
+  gem.add_dependency 'rake', '~> 10.2.1'
 end
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End:

data/spec/paper_house/executable_task_spec.rb

@@ -1,20 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2013 NEC Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License, version 3, as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
+# encoding: utf-8
 
 require 'paper_house/executable_task'
 
@@ -46,49 +30,38 @@ describe Rake::Task do
   end
 end
 
-#
-# PaperHouse::ExecutableTask spec.
-#
-module PaperHouse
-  describe ExecutableTask, '.new' do
-    context 'with name :test' do
-      subject { ExecutableTask.new :test }
+describe PaperHouse::ExecutableTask, '.new' do
+  context 'with name :test' do
+    subject { PaperHouse::ExecutableTask.new :test }
 
-      its(:cc) { should eq 'gcc' }
-      its(:cflags) { should be_empty }
-      its(:executable_name) { should eq 'test' }
-      its(:includes) { should be_empty }
-      its(:ldflags) { should be_empty }
-      its(:library_dependencies) { should be_empty }
-      its(:name) { should eq 'test' }
-      its(:sources) { should eq '*.c'  }
-      its(:target_directory) { should eq '.' }
-    end
+    its(:cc) { should eq 'gcc' }
+    its(:cflags) { should be_empty }
+    its(:executable_name) { should eq 'test' }
+    its(:includes) { should be_empty }
+    its(:ldflags) { should be_empty }
+    its(:library_dependencies) { should be_empty }
+    its(:name) { should eq 'test' }
+    its(:sources) { should eq '*.c'  }
+    its(:target_directory) { should eq '.' }
+  end
 
-    context 'with :test and block' do
-      subject do
-        ExecutableTask.new(:test) do | task |
-          task.executable_name = executable_name
-        end
+  context 'with :test and block' do
+    subject do
+      PaperHouse::ExecutableTask.new(:test) do | task |
+        task.executable_name = executable_name
       end
+    end
 
-      context %{with #executable_name = 'new_name'} do
-        let(:executable_name) { 'new_name' }
+    context %(with #executable_name = 'new_name') do
+      let(:executable_name) { 'new_name' }
 
-        its(:executable_name) { should eq 'new_name' }
-      end
+      its(:executable_name) { should eq 'new_name' }
+    end
 
-      context 'with #executable_name = :new_name' do
-        let(:executable_name) { :new_name }
+    context 'with #executable_name = :new_name' do
+      let(:executable_name) { :new_name }
 
-        its(:executable_name) { should eq :new_name }
-      end
+      its(:executable_name) { should eq :new_name }
     end
   end
 end
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End:

data/spec/paper_house/ruby_extension_task_spec.rb

@@ -1,20 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2013 NEC Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License, version 3, as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
+# encoding: utf-8
 
 require 'paper_house/ruby_extension_task'
 
@@ -46,51 +30,46 @@ describe Rake::Task do
   end
 end
 
-#
-# PaperHouse::RubyExtensionTask spec.
-#
-module PaperHouse
-  describe RubyExtensionTask, '.new :test' do
-    before { Rake::Task.clear }
+describe PaperHouse::RubyExtensionTask do
+  before { Rake::Task.clear }
 
-    describe '.find_named' do
-      subject { RubyExtensionTask.find_named name }
+  describe '.find_named' do
+    subject { PaperHouse::RubyExtensionTask.find_named name }
 
-      context 'with :test' do
-        let(:name) { :test }
+    context 'with :test' do
+      let(:name) { :test }
 
-        context 'when RubyExtensionTask named :test is defined' do
-          before { RubyExtensionTask.new :test }
+      context 'when RubyExtensionTask named :test is defined' do
+        before { PaperHouse::RubyExtensionTask.new :test }
 
-          it { expect(subject).to be_a RubyExtensionTask }
-        end
+        it { expect(subject).to be_a PaperHouse::RubyExtensionTask }
+      end
 
-        context 'when RubyExtensionTask named :test is not defined' do
-          it { expect(subject).to be_nil }
-        end
+      context 'when RubyExtensionTask named :test is not defined' do
+        it { expect(subject).to be_nil }
       end
+    end
 
-      context %{with 'test'} do
-        let(:name) { 'test' }
+    context %(with 'test') do
+      let(:name) { 'test' }
 
-        context %{when RubyExtensionTask named 'test' is defined} do
-          before { RubyExtensionTask.new :test }
+      context %(when RubyExtensionTask named 'test' is defined) do
+        before { PaperHouse::RubyExtensionTask.new :test }
 
-          it { expect(subject).to be_a RubyExtensionTask }
-        end
+        it { expect(subject).to be_a PaperHouse::RubyExtensionTask }
       end
+    end
 
-      context 'with :no_such_task' do
-        let(:name) { :no_such_task }
+    context 'with :no_such_task' do
+      let(:name) { :no_such_task }
 
-        it { expect(subject).to be_nil }
-      end
+      it { expect(subject).to be_nil }
     end
   end
 
   describe '.new' do
     context 'with :test' do
-      subject { RubyExtensionTask.new :test }
+      subject { PaperHouse::RubyExtensionTask.new :test }
 
       its(:cc) { should eq 'gcc' }
       its(:cflags) { should be_empty }
@@ -102,12 +81,12 @@ module PaperHouse
 
     context 'with :test and block' do
       subject do
-        RubyExtensionTask.new(:test) do | task |
+        PaperHouse::RubyExtensionTask.new(:test) do | task |
           task.library_name = library_name
         end
       end
 
-      context %{with #library_name = 'new_name'} do
+      context %(with #library_name = 'new_name') do
         let(:library_name) { 'new_name' }
 
         its(:library_name) { should eq 'new_name' }
@@ -121,9 +100,3 @@ module PaperHouse
     end
   end
 end
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End:

data/spec/paper_house/shared_library_task_spec.rb

@@ -1,20 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2013 NEC Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License, version 3, as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
+# encoding: utf-8
 
 require 'paper_house/shared_library_task'
 
@@ -46,51 +30,46 @@ describe Rake::Task do
   end
 end
 
-#
-# PaperHouse::SharedLibraryTask spec.
-#
-module PaperHouse
-  describe SharedLibraryTask do
-    before { Rake::Task.clear }
+describe PaperHouse::SharedLibraryTask do
+  before { Rake::Task.clear }
 
-    describe '.find_named' do
-      subject { SharedLibraryTask.find_named name }
+  describe '.find_named' do
+    subject { PaperHouse::SharedLibraryTask.find_named name }
 
-      context 'with :libtest' do
-        let(:name) { :libtest }
+    context 'with :libtest' do
+      let(:name) { :libtest }
 
-        context 'when SharedLibraryTask named :libtest is defined' do
-          before { SharedLibraryTask.new :libtest, '0.1.0' }
+      context 'when SharedLibraryTask named :libtest is defined' do
+        before { PaperHouse::SharedLibraryTask.new :libtest, '0.1.0' }
 
-          it { expect(subject).to be_a SharedLibraryTask }
-        end
+        it { expect(subject).to be_a PaperHouse::SharedLibraryTask }
+      end
 
-        context 'when SharedLibraryTask named :libtest is not defined' do
-          it { expect(subject).to be_nil }
-        end
+      context 'when SharedLibraryTask named :libtest is not defined' do
+        it { expect(subject).to be_nil }
       end
+    end
 
-      context %{with 'libtest'} do
-        let(:name) { 'libtest' }
+    context %(with 'libtest') do
+      let(:name) { 'libtest' }
 
-        context %{when SharedLibraryTask named 'libtest' is defined} do
-          before { SharedLibraryTask.new :libtest, '0.1.0' }
+      context %(when SharedLibraryTask named 'libtest' is defined) do
+        before { PaperHouse::SharedLibraryTask.new :libtest, '0.1.0' }
 
-          it { expect(subject).to be_a SharedLibraryTask }
-        end
+        it { expect(subject).to be_a PaperHouse::SharedLibraryTask }
       end
+    end
 
-      context 'with :no_such_task' do
-        let(:name) { :no_such_task }
+    context 'with :no_such_task' do
+      let(:name) { :no_such_task }
 
-        it { expect(subject).to be_nil }
-      end
+      it { expect(subject).to be_nil }
     end
   end
 
   describe '.new' do
-    context %{with name :libtest and version '0.1.0'} do
-      subject { SharedLibraryTask.new :libtest, '0.1.0' }
+    context %(with name :libtest and version '0.1.0') do
+      subject { PaperHouse::SharedLibraryTask.new :libtest, '0.1.0' }
 
       its(:cc) { should eq 'gcc' }
       its(:cflags) { should be_empty }
@@ -107,7 +86,7 @@ module PaperHouse
     end
 
     context 'with name :libtest and no version string' do
-      subject { SharedLibraryTask.new :libtest }
+      subject { PaperHouse::SharedLibraryTask.new :libtest }
 
       it do
         expect { subject }.to raise_error('version option is a mandatory.')
@@ -116,16 +95,16 @@ module PaperHouse
 
     context 'with name :libtest and block' do
       subject do
-        SharedLibraryTask.new(:libtest) do | task |
+        PaperHouse::SharedLibraryTask.new(:libtest) do | task |
           task.library_name = library_name
           task.version = version
         end
       end
 
-      context %{with #version = '0.1.0'} do
+      context %(with #version = '0.1.0') do
         let(:version) { '0.1.0' }
 
-        context %{with #library_name = 'libtest'} do
+        context %(with #library_name = 'libtest') do
           let(:library_name) { 'libtest' }
 
           its(:library_name) { should eq 'libtest' }
@@ -137,7 +116,7 @@ module PaperHouse
           its(:library_name) { should eq 'libtest' }
         end
 
-        context %{with #library_name = 'test'} do
+        context %(with #library_name = 'test') do
           let(:library_name) { 'test' }
 
           its(:library_name) { should eq 'libtest' }
@@ -161,9 +140,3 @@ module PaperHouse
     end
   end
 end
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End:

data/spec/paper_house/static_library_task_spec.rb

@@ -1,24 +1,8 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2013 NEC Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License, version 3, as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
+# encoding: utf-8
 
 require 'paper_house/static_library_task'
 
-describe 'Rake::Task' do
+describe Rake::Task do
   before { Rake::Task.clear }
 
   describe '.[]' do
@@ -46,70 +30,59 @@ describe 'Rake::Task' do
   end
 end
 
-#
-# PaperHouse::StaticLibraryTask spec.
-#
-module PaperHouse
-  describe StaticLibraryTask do
-    before { Rake::Task.clear }
+describe PaperHouse::StaticLibraryTask do
+  before { Rake::Task.clear }
 
-    describe '.find_named' do
-      subject { StaticLibraryTask.find_named name }
+  describe '.find_named' do
+    subject { PaperHouse::StaticLibraryTask.find_named name }
 
-      context 'with :libtest' do
-        let(:name) { :libtest }
+    context 'with :libtest' do
+      let(:name) { :libtest }
 
-        context 'when StaticLibraryTask named :libtest is defined' do
-          before { StaticLibraryTask.new :libtest }
+      context 'when StaticLibraryTask named :libtest is defined' do
+        before { PaperHouse::StaticLibraryTask.new :libtest }
 
-          it { expect(subject).to be_a StaticLibraryTask }
-        end
+        it { expect(subject).to be_a PaperHouse::StaticLibraryTask }
+      end
 
-        context 'when StaticLibraryTask named :libtest is not defined' do
-          it { expect(subject).to be_nil }
-        end
+      context 'when StaticLibraryTask named :libtest is not defined' do
+        it { expect(subject).to be_nil }
       end
+    end
 
-      context %{with 'libtest'} do
-        let(:name) { 'libtest' }
+    context %(with 'libtest') do
+      let(:name) { 'libtest' }
 
-        context 'when StaticLibraryTask named :libtest is defined' do
-          before { StaticLibraryTask.new :libtest }
+      context 'when StaticLibraryTask named :libtest is defined' do
+        before { PaperHouse::StaticLibraryTask.new :libtest }
 
-          it { expect(subject).to be_a StaticLibraryTask }
-        end
+        it { expect(subject).to be_a PaperHouse::StaticLibraryTask }
       end
+    end
 
-      context 'with :no_such_task' do
-        let(:name) { :no_such_task }
+    context 'with :no_such_task' do
+      let(:name) { :no_such_task }
 
-        it { expect(subject).to be_nil }
-      end
+      it { expect(subject).to be_nil }
     end
+  end
 
-    describe '.new' do
-      subject { StaticLibraryTask.new task }
-
-      context 'with :libtest' do
-        let(:task) { :libtest }
-
-        its(:cc) { should eq 'gcc' }
-        its(:cflags) { should be_empty }
-        its(:includes) { should be_empty }
-        its(:name) { should eq 'libtest' }
-        its(:sources) { should eq '*.c'  }
-        its(:target_directory) { should eq '.' }
-        its(:library_name) { should eq 'libtest' }
-        its(:lname) { should eq 'test' }
-        its(:target_file_name) { should eq 'libtest.a' }
-        its(:target_path) { should eq './libtest.a' }
-      end
+  describe '.new' do
+    subject { PaperHouse::StaticLibraryTask.new task }
+
+    context 'with :libtest' do
+      let(:task) { :libtest }
+
+      its(:cc) { should eq 'gcc' }
+      its(:cflags) { should be_empty }
+      its(:includes) { should be_empty }
+      its(:name) { should eq 'libtest' }
+      its(:sources) { should eq '*.c'  }
+      its(:target_directory) { should eq '.' }
+      its(:library_name) { should eq 'libtest' }
+      its(:lname) { should eq 'test' }
+      its(:target_file_name) { should eq 'libtest.a' }
+      its(:target_path) { should eq './libtest.a' }
     end
   end
 end
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End: