ruby-yasm 0.2.0 → 0.2.1

data/.document

@@ -0,0 +1,3 @@
+-
+ChangeLog.md
+LICENSE.txt

data/.gitignore

@@ -0,0 +1,7 @@
+doc
+pkg
+.yardoc
+.DS_Store
+*.log
+*.swp
+*~

data/.yardopts

@@ -1 +1 @@
---markup markdown --title 'Ruby YASM Documentation' --protected --files ChangeLog.md,LICENSE.txt
+--markup markdown --title 'Ruby YASM Documentation' --protected

data/ChangeLog.md

@@ -1,3 +1,10 @@
+### 0.2.1 / 2012-05-27
+
+* {YASM::Task#target!} now raises an `ArgumentError` when given an unknown
+  target.
+* Replaced ore-tasks with
+  [rubygems-tasks](https://github.com/postmodern/rubygems-tasks#readme).
+
 ### 0.2.0 / 2011-04-11
 
 * Require rprogram ~> 0.3.

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2011 Hal Brodigan
+Copyright (c) 2009-2012 Postmodern
 
 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,7 +1,7 @@
 # ruby-yasm
 
-* [Source](http://github.com/sophsec/ruby-yasm/)
-* [Issues](http://github.com/sophsec/ruby-yasm/issues)
+* [Source](https://github.com/sophsec/ruby-yasm/)
+* [Issues](https://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/)
@@ -26,7 +26,7 @@ Assemble a binary file:
 
     YASM::Program.assemble do |yasm|
       yasm.syntax = :gas
-      yasm.file = 'hello_world.S'
+      yasm.file   = 'hello_world.S'
       yasm.output = 'hello_world.o'
     end
 
@@ -37,11 +37,11 @@ debugging information:
       yasm.target! :amd64
 
       yasm.syntax = :gas
-      yasm.file = 'hello_world.S'
+      yasm.file   = 'hello_world.S'
 
-      yasm.output = 'hello_world.o'
+      yasm.output        = 'hello_world.o'
       yasm.output_format = :elf64
-      yasm.debug_format = :stabs
+      yasm.debug_format  = :stabs
     end
 
 ## Requirements
@@ -55,6 +55,6 @@ debugging information:
 
 ## License
 
-Copyright (c) 2009-2011 Hal Brodigan
+Copyright (c) 2009-2017 Postmodern
 
 See {file:LICENSE.txt} for license information.

data/Rakefile

@@ -2,13 +2,13 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'ore-tasks', '~> 0.4'
-  require 'ore/tasks'
+  gem 'rubygems-tasks', '~> 0.1'
+  require 'rubygems/tasks'
 
-  Ore::Tasks.new
+  Gem::Tasks.new
 rescue LoadError => e
-  STDERR.puts e.message
-  STDERR.puts "Run `gem install ore-tasks` to install 'ore/tasks'."
+  warn e.message
+  warn "Run `gem install rubygems-tasks` to install 'rubygems/tasks'."
 end
 
 begin
@@ -25,7 +25,7 @@ task :test => :spec
 task :default => :spec
 
 begin
-  gem 'yard', '~> 0.6.0'
+  gem 'yard', '~> 0.7'
   require 'yard'
 
   YARD::Rake::YardocTask.new  

data/gemspec.yml

@@ -6,7 +6,7 @@ description:
 license: MIT
 authors: Postmodern
 email: postmodern.mod3@gmail.com
-homepage: http://github.com/sophsec/ruby-yasm
+homepage: https://github.com/sophsec/ruby-yasm#readme
 has_yard: true
 
 requirements: yasm >= 0.6.0
@@ -15,6 +15,6 @@ dependencies:
   rprogram: ~> 0.3
 
 development_dependencies:
-  ore-tasks: ~> 0.4
+  rubygems-tasks: ~> 0.1
   rspec: ~> 2.4
-  yard: ~> 0.6.0
+  yard: ~> 0.7

data/lib/yasm/program.rb

@@ -27,14 +27,18 @@ module YASM
     #   Specifies whether the command exited normally.
     #
     # @example
-    #   Program.assemble(:parser => :gas, :output => 'code.o', :file => 'code.S')
+    #   Program.assemble(
+    #     :parser => :gas,
+    #     :output => 'code.o',
+    #     :file   => 'code.S'
+    #   )
     #
     # @example
     #   Program.assemble do |yasm|
     #     yasm.target! :x86
     #
     #     yasm.syntax = :gas
-    #     yasm.file = 'code.S'
+    #     yasm.file   = 'code.S'
     #     yasm.output = 'code.o'
     #   end
     #
@@ -64,14 +68,18 @@ module YASM
     #   Specifies whether the command exited normally.
     #
     # @example
-    #   Program.assemble(:parser => :gas, :output => 'code.o', :file => 'code.S')
+    #   Program.assemble(
+    #     :parser => :gas,
+    #     :output => 'code.o',
+    #     :file   => 'code.S'
+    #   )
     #
     # @example
     #   Program.assemble do |yasm|
     #     yasm.target! :x86
     #
     #     yasm.syntax = :gas
-    #     yasm.file = 'code.S'
+    #     yasm.file   = 'code.S'
     #     yasm.output = 'code.o'
     #   end
     #

data/lib/yasm/task.rb

@@ -41,9 +41,9 @@ module YASM
 
     # The known YASM targets
     TARGETS = {
-      :x86 => {:arch => :x86, :machine => :x86},
+      :x86   => {:arch => :x86, :machine => :x86},
       :amd64 => {:arch => :x86, :machine => :amd64},
-      :lc3b => {:arch => :lc3b, :machine => :lc3b}
+      :lc3b  => {:arch => :lc3b, :machine => :lc3b}
     }
 
     long_option :flag => '--version'
@@ -75,21 +75,21 @@ module YASM
                 :equals => true,
                 :name => :map_file
 
-    long_option :flag => '--machine', :equals => true
-    long_option :flag => '--force-strict'
+    long_option  :flag => '--machine', :equals => true
+    long_option  :flag => '--force-strict'
     short_option :flag => '-w', :name => :inhibit_warnings
     short_option :flag => '-W', :name => :toggle_warnings
     short_option :flag => '-M', :name => :gen_makefile_deps
     short_option :flag => '-E', :name => :redirect_errors_to
     short_option :flag => '-s', :name => :redirect_errors
-    long_option :flag => '--preproc-only', :name => :preprocessor_only
+    long_option  :flag => '--preproc-only', :name => :preprocessor_only
     short_option :flag => '-I', :name => :include, :multiple => true
     short_option :flag => '-P', :name => :pre_include, :multiple => true
     short_option :flag => '-D', :name => :define, :multiple => true
     short_option :flag => '-U', :name => :undefine, :multiple => true
     short_option :flag => '-X', :name => :message_style
-    long_option :flag => '--prefix'
-    long_option :flag => '--suffix'
+    long_option  :flag => '--prefix'
+    long_option  :flag => '--suffix'
 
     non_option :tailing => true, :name => :file
 
@@ -125,7 +125,7 @@ module YASM
     # @param [String, Symbol] name
     #   The target name.
     #
-    # @raise [RuntimeError]
+    # @raise [ArgumentError]
     #   The specified target is unknown.
     #
     # @return [true]
@@ -138,10 +138,10 @@ module YASM
       target = TARGETS[name.to_sym]
 
       unless target
-        raise(RuntimeError,"unknown YASM target #{name.inspect}",caller)
+        raise(ArgumentError,"unknown YASM target #{name.inspect}")
       end
 
-      self.arch = target[:arch]
+      self.arch    = target[:arch]
       self.machine = target[:machine]
       return true
     end

data/lib/yasm/version.rb

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

data/ruby-yasm.gemspec

@@ -1,15 +1,105 @@
-# -*- encoding: utf-8 -*-
-
-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."
+# encoding: utf-8
+
+require 'yaml'
+
+Gem::Specification.new do |gemspec|
+  root    = File.dirname(__FILE__)
+  lib_dir = File.join(root,'lib')
+  files   = `git ls-files`.split($/)
+
+  filter_files = lambda { |paths|
+    files & case paths
+            when Array
+              paths
+            when String
+              Dir[paths]
+            end
+  }
+
+  version = {
+    :file     => 'yasm/version',
+    :constant => 'YASM::VERSION'
+  }
+
+  defaults = {
+    'name'            => File.basename(root),
+    'files'           => files,
+    'require_paths'   => ['ext', 'lib'].select { |dir| File.directory?(dir) },
+    'executables'     => filter_files['bin/*'].map { |path| File.basename(path) },
+    'test_files'      => filter_files['{test/{**/}*_test.rb,spec/{**/}*_spec.rb}'],
+    'doc_files'       => filter_files['*.{txt,rdoc,md,markdown,tt,textile}'],
+    'extra_doc_files' => filter_files['*.{txt,rdoc,md,markdown,tt,textile}']
+  }
+
+  metadata = defaults.merge(YAML.load_file('gemspec.yml'))
+
+  gemspec.name    = metadata['name']
+  gemspec.version = if metadata['version']
+                      metadata['version']
+                    else
+                      $LOAD_PATH << lib_dir unless $LOAD_PATH.include?(lib_dir)
+
+                      require version[:file]
+                      eval(version[:constant])
+                    end
+
+  gemspec.summary     = metadata.fetch('summary',metadata['description'])
+  gemspec.description = metadata.fetch('description',metadata['summary'])
+
+  gemspec.licenses = Array(metadata['license'])
+  gemspec.authors  = Array(metadata['authors'])
+
+  gemspec.email    = metadata['email']
+  gemspec.homepage = metadata['homepage']
+
+  gemspec.require_paths = Array(metadata['require_paths'])
+  gemspec.files         = filter_files[metadata['files']]
+  gemspec.files        += Array(metadata['generated_files'])
+  gemspec.executables   = metadata['executables']
+  gemspec.extensions    = metadata['extensions']
+
+  if Gem::VERSION < '1.7.'
+    gemspec.default_executable = gemspec.executables.first
+  end
+
+  gemspec.test_files       = filter_files[metadata['test_files']]
+  gemspec.extra_rdoc_files = Array(metadata['extra_doc_files'])
+
+  gemspec.post_install_message = metadata['post_install_message']
+  gemspec.requirements         = metadata['requirements']
+
+  if gemspec.respond_to?(:required_ruby_version=)
+    gemspec.required_ruby_version = metadata['required_ruby_version']
+  end
+
+  if gemspec.respond_to?(:required_rubygems_version=)
+    gemspec.required_rubygems_version = metadata['required_ruby_version']
+  end
+
+  parse_versions = lambda { |versions|
+    case versions
+    when Array
+      versions.map { |v| v.to_s }
+    when String
+      versions.split(/,\s*/)
+    end
+  }
+
+  if metadata['dependencies']
+    metadata['dependencies'].each do |name,versions|
+      gemspec.add_dependency(name,parse_versions[versions])  
+    end
+  end
+
+  if metadata['runtime_dependencies']
+    metadata['runtime_dependencies'].each do |name,versions|
+      gemspec.add_runtime_dependency(name,parse_versions[versions])  
+    end
+  end
+
+  if metadata['development_dependencies']
+    metadata['development_dependencies'].each do |name,versions|
+      gemspec.add_development_dependency(name,parse_versions[versions])  
+    end
   end
 end

data/spec/program_spec.rb

@@ -7,14 +7,12 @@ require 'tempfile'
 describe Program do
   include Helpers::Files
 
-  before(:all) do
-    @yasm = Program.find
-  end
+  subject { described_class.find }
 
   it "should be able to assemble a file" do
     file = Tempfile.new('yasm').path
 
-    @yasm.assemble do |yasm|
+    subject.assemble do |yasm|
       yasm.target! :x86
 
       yasm.syntax = :gas

data/spec/task_spec.rb

@@ -17,53 +17,53 @@ describe Task do
       task.target!(:amd64).should == true
     end
 
-    it "should raise RuntimeError when passed unknown targets" do
+    it "should raise ArgumentError when passed unknown targets" do
       task = Task.new
 
       lambda {
         task.target! :lol
-      }.should raise_error(RuntimeError)
+      }.should raise_error(ArgumentError)
     end
 
     describe "x86" do
-      before(:all) do
-        @task = Task.new { |task| task.target! :x86 }
+      subject do
+        Task.new { |task| task.target! :x86 }
       end
 
       it "should set the arch value" do
-        @task.arch.should == :x86
+        subject.arch.should == :x86
       end
 
       it "should set the machine value" do
-        @task.machine.should == :x86
+        subject.machine.should == :x86
       end
     end
 
     describe "amd64" do
-      before(:all) do
-        @task = Task.new { |task| task.target! :amd64 }
+      subject do
+        Task.new { |task| task.target! :amd64 }
       end
 
       it "should set the arch value" do
-        @task.arch.should == :x86
+        subject.arch.should == :x86
       end
 
       it "should set the machine value" do
-        @task.machine.should == :amd64
+        subject.machine.should == :amd64
       end
     end
 
     describe "lc3b" do
-      before(:all) do
-        @task = Task.new { |task| task.target! :lc3b }
+      subject do
+        Task.new { |task| task.target! :lc3b }
       end
 
       it "should set the arch value" do
-        @task.arch.should == :lc3b
+        subject.arch.should == :lc3b
       end
 
       it "should set the machine value" do
-        @task.machine.should == :lc3b
+        subject.machine.should == :lc3b
       end
     end
   end

data/spec/yasm_spec.rb

@@ -4,6 +4,6 @@ require 'spec_helper'
 
 describe YASM do
   it "should have a VERSION constant" do
-    YASM.const_defined?('VERSION').should == true
+    subject.const_defined?('VERSION').should == true
   end
 end

metadata

@@ -1,72 +1,92 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-yasm
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.1
   prerelease: 
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Postmodern
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-11 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rprogram
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.3"
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ore-tasks
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: rubygems-tasks
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.4"
+      - !ruby/object:Gem::Version
+        version: '0.1'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.4"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.6.0
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
 description: ruby-yasm provides a Ruby interface to YASM assembler.
-email: 
-- postmodern.mod3@gmail.com
+email: postmodern.mod3@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
+- ChangeLog.md
+- LICENSE.txt
 - README.md
-files: 
+files:
+- .document
 - .gemtest
+- .gitignore
 - .rspec
 - .specopts
 - .yardopts
@@ -86,34 +106,33 @@ files:
 - spec/spec_helper.rb
 - spec/task_spec.rb
 - spec/yasm_spec.rb
-homepage: http://github.com/sophsec/ruby-yasm
-licenses: 
+homepage: https://github.com/sophsec/ruby-yasm#readme
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - 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
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - yasm >= 0.6.0
-rubyforge_project: ruby-yasm
-rubygems_version: 1.7.2
+rubyforge_project: 
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A Ruby interface to YASM.
-test_files: 
+test_files:
 - spec/program_spec.rb
-- spec/yasm_spec.rb
 - spec/task_spec.rb
+- spec/yasm_spec.rb