ruby-yasm 0.1.1 → 0.2.0

data/.rspec

@@ -0,0 +1 @@
+--colour --format documentation

data/ChangeLog.md

@@ -1,3 +1,10 @@
+### 0.2.0 / 2011-04-11
+
+* Require rprogram ~> 0.3.
+* Allow passing in additional exec-options in {YASM::Program.assemble}
+  and {YASM::Program#assemble}.
+* Opt into [test.rubygems.org](http://test.rubygems.org/)
+
 ### 0.1.1 / 2010-04-15
 
 * Migrated to [Jeweler](http://github.com/technicalpickles/jeweler)

data/LICENSE.txt

@@ -1,6 +1,4 @@
-(The MIT License)
-
-Copyright (c) 2009-2010 Hal Brodigan
+Copyright (c) 2009-2011 Hal Brodigan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,10 +1,10 @@
 # ruby-yasm
 
-* [github.com/sophsec/ruby-yasm](http://github.com/sophsec/ruby-yasm/)
-* [github.com/sophsec/ruby-yasm/issues](http://github.com/sophsec/ruby-yasm/issues)
+* [Source](http://github.com/sophsec/ruby-yasm/)
+* [Issues](http://github.com/sophsec/ruby-yasm/issues)
+* [Email](mailto:postmodern.mod3 at gmail.com)
 * [www.tortall.net/projects/yasm](http://www.tortall.net/projects/yasm/)
 * [www.sophsec.com](http://www.sophsec.com/)
-* Postmodern (postmodern.mod3 at gmail.com)
 
 ## Description
 
@@ -46,8 +46,8 @@ debugging information:
 
 ## Requirements
 
-* [yasm](http://www.tortall.net/projects/yasm/) >= 0.8.0.
-* [rprogram](http://rprogram.rubyforge.org/) >= 0.1.8.
+* [yasm](http://www.tortall.net/projects/yasm/) >= 0.8.0
+* [rprogram](http://rprogram.rubyforge.org/) ~> 0.3
 
 ## Install
 
@@ -55,5 +55,6 @@ debugging information:
 
 ## License
 
-See {file:LICENSE.txt} for license information.
+Copyright (c) 2009-2011 Hal Brodigan
 
+See {file:LICENSE.txt} for license information.

data/Rakefile

@@ -1,43 +1,36 @@
 require 'rubygems'
 require 'rake'
-require './lib/yasm/version.rb'
 
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = 'ruby-yasm'
-    gem.version = YASM::VERSION
-    gem.summary = %Q{A Ruby interface to YASM.}
-    gem.description = %Q{A Ruby interface to YASM.}
-    gem.email = 'postmodern.mod3@gmail.com'
-    gem.homepage = 'http://github.com/sophsec/ruby-yasm'
-    gem.authors = ['Postmodern']
-    gem.add_dependency 'rprogram', '~> 0.1.8'
-    gem.add_development_dependency 'rspec', '~> 1.3.0'
-    gem.add_development_dependency 'yard', '~> 0.5.3'
-    gem.has_rdoc = 'yard'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+  gem 'ore-tasks', '~> 0.4'
+  require 'ore/tasks'
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs += ['lib', 'spec']
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-  spec.spec_opts = ['--options', '.specopts']
+  Ore::Tasks.new
+rescue LoadError => e
+  STDERR.puts e.message
+  STDERR.puts "Run `gem install ore-tasks` to install 'ore/tasks'."
 end
 
-task :spec => :check_dependencies
+begin
+  gem 'rspec', '~> 2.4'
+  require 'rspec/core/rake_task'
+
+  RSpec::Core::RakeTask.new
+rescue LoadError => e
+  task :spec do
+    abort "Please run `gem install rspec` to install RSpec."
+  end
+end
+task :test => :spec
 task :default => :spec
 
 begin
+  gem 'yard', '~> 0.6.0'
   require 'yard'
 
-  YARD::Rake::YardocTask.new
-rescue LoadError
+  YARD::Rake::YardocTask.new  
+rescue LoadError => e
   task :yard do
-    abort "YARD is not available. In order to run yard, you must: gem install yard"
+    abort "Please run `gem install yard` to install YARD."
   end
 end

data/gemspec.yml

@@ -0,0 +1,20 @@
+name: ruby-yasm
+summary: A Ruby interface to YASM.
+description:
+  ruby-yasm provides a Ruby interface to YASM assembler.
+
+license: MIT
+authors: Postmodern
+email: postmodern.mod3@gmail.com
+homepage: http://github.com/sophsec/ruby-yasm
+has_yard: true
+
+requirements: yasm >= 0.6.0
+
+dependencies:
+  rprogram: ~> 0.3
+
+development_dependencies:
+  ore-tasks: ~> 0.4
+  rspec: ~> 2.4
+  yard: ~> 0.6.0

data/lib/yasm/program.rb

@@ -1,7 +1,6 @@
 require 'yasm/task'
 
 require 'rprogram'
-require 'tempfile'
 
 module YASM
   class Program < RProgram::Program
@@ -14,6 +13,9 @@ module YASM
     # @param [Hash{Symbol => Object}] options
     #   Additional options for yasm.
     #
+    # @param [Hash{Symbol => Object}] exec_options
+    #   Additional exec-options.
+    #
     # @yield [task]
     #   If a block is given, it will be passed a task object used to
     #   specify options for yasm.
@@ -36,8 +38,10 @@ module YASM
     #     yasm.output = 'code.o'
     #   end
     #
-    def Program.assemble(options={},&block)
-      Program.find().assemble(options,&block)
+    # @see #assemble
+    #
+    def self.assemble(options={},exec_options={},&block)
+      find.assemble(options,exec_options,&block)
     end
 
     #
@@ -46,6 +50,9 @@ module YASM
     # @param [Hash{Symbol => Object}] options
     #   Additional options for yasm.
     #
+    # @param [Hash{Symbol => Object}] exec_options
+    #   Additional exec-options.
+    #
     # @yield [task]
     #   If a block is given, it will be passed a task object used to
     #   specify options for yasm.
@@ -68,8 +75,11 @@ module YASM
     #     yasm.output = 'code.o'
     #   end
     #
-    def assemble(options={},&block)
-      run_task(Task.new(options,&block))
+    # @see http://rubydoc.info/gems/rprogram/0.3.0/RProgram/Program#run-instance_method
+    #   For additional exec-options.
+    #
+    def assemble(options={},exec_options={},&block)
+      run_task(Task.new(options,&block),exec_options)
     end
 
   end

data/lib/yasm/task.rb

@@ -116,7 +116,7 @@ module YASM
 
       super(options,&block)
 
-      self.target!(target) if target
+      target!(target) if target
     end
 
     #

data/lib/yasm/version.rb

@@ -1,4 +1,4 @@
 module YASM
   # ruby-yasm VERSION
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/ruby-yasm.gemspec

@@ -1,73 +1,15 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name = %q{ruby-yasm}
-  s.version = "0.1.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Postmodern"]
-  s.date = %q{2010-04-15}
-  s.description = %q{A Ruby interface to YASM.}
-  s.email = %q{postmodern.mod3@gmail.com}
-  s.extra_rdoc_files = [
-    "ChangeLog.md",
-     "LICENSE.txt",
-     "README.md"
-  ]
-  s.files = [
-    ".gitignore",
-     ".specopts",
-     ".yardopts",
-     "ChangeLog.md",
-     "LICENSE.txt",
-     "README.md",
-     "Rakefile",
-     "lib/yasm.rb",
-     "lib/yasm/program.rb",
-     "lib/yasm/task.rb",
-     "lib/yasm/version.rb",
-     "ruby-yasm.gemspec",
-     "spec/helpers/files.rb",
-     "spec/helpers/files/gas.S",
-     "spec/program_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/task_spec.rb",
-     "spec/yasm_spec.rb"
-  ]
-  s.has_rdoc = %q{yard}
-  s.homepage = %q{http://github.com/sophsec/ruby-yasm}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{A Ruby interface to YASM.}
-  s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/yasm_spec.rb",
-     "spec/helpers/files.rb",
-     "spec/program_spec.rb",
-     "spec/task_spec.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rprogram>, ["~> 0.1.8"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.3.0"])
-      s.add_development_dependency(%q<yard>, ["~> 0.5.3"])
-    else
-      s.add_dependency(%q<rprogram>, ["~> 0.1.8"])
-      s.add_dependency(%q<rspec>, ["~> 1.3.0"])
-      s.add_dependency(%q<yard>, ["~> 0.5.3"])
-    end
-  else
-    s.add_dependency(%q<rprogram>, ["~> 0.1.8"])
-    s.add_dependency(%q<rspec>, ["~> 1.3.0"])
-    s.add_dependency(%q<yard>, ["~> 0.5.3"])
+begin
+  Ore::Specification.new do |gemspec|
+    # custom logic here
+  end
+rescue NameError
+  begin
+    require 'ore/specification'
+    retry
+  rescue LoadError
+    STDERR.puts "The 'ruby-yasm.gemspec' file requires Ore."
+    STDERR.puts "Run `gem install ore-core` to install Ore."
   end
 end
-

data/spec/program_spec.rb

@@ -1,8 +1,9 @@
-require 'yasm/program'
-
 require 'spec_helper'
 require 'helpers/files'
 
+require 'yasm/program'
+require 'tempfile'
+
 describe Program do
   include Helpers::Files
 

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
-gem 'rspec', '>=1.3.0'
-require 'spec'
+gem 'rspec', '~> 2.4'
+require 'rspec'
 
 require 'yasm/version'
 

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-yasm
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors: 
 - Postmodern
@@ -14,69 +10,71 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-15 00:00:00 -07:00
-default_executable: 
+date: 2011-04-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rprogram
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 8
-        version: 0.1.8
+        version: "0.3"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: ore-tasks
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
+        version: "0.4"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 3
-        version: 0.5.3
+        version: "2.4"
   type: :development
   version_requirements: *id003
-description: A Ruby interface to YASM.
-email: postmodern.mod3@gmail.com
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.6.0
+  type: :development
+  version_requirements: *id004
+description: ruby-yasm provides a Ruby interface to YASM assembler.
+email: 
+- postmodern.mod3@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- ChangeLog.md
-- LICENSE.txt
 - README.md
 files: 
-- .gitignore
+- .gemtest
+- .rspec
 - .specopts
 - .yardopts
 - ChangeLog.md
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemspec.yml
 - lib/yasm.rb
 - lib/yasm/program.rb
 - lib/yasm/task.rb
@@ -88,39 +86,34 @@ files:
 - spec/spec_helper.rb
 - spec/task_spec.rb
 - spec/yasm_spec.rb
-has_rdoc: yard
 homepage: http://github.com/sophsec/ruby-yasm
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
-requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.6
+requirements: 
+- yasm >= 0.6.0
+rubyforge_project: ruby-yasm
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: A Ruby interface to YASM.
 test_files: 
-- spec/spec_helper.rb
-- spec/yasm_spec.rb
-- spec/helpers/files.rb
 - spec/program_spec.rb
+- spec/yasm_spec.rb
 - spec/task_spec.rb

data/.gitignore

@@ -1,10 +0,0 @@
-doc
-pkg
-tmp/*
-scripts/*_wordlist.txt
-.yardoc
-.DS_Store
-*.db
-*.log
-*.swp
-*~