ruby-yasm 0.2.1 → 0.3.0

data/ruby-yasm.gemspec

@@ -1,105 +1,58 @@
-# 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}']
-  }
+Gem::Specification.new do |gem|
+  gemspec = YAML.load_file('gemspec.yml')
 
-  metadata = defaults.merge(YAML.load_file('gemspec.yml'))
+  gem.name    = gemspec.fetch('name')
+  gem.version = gemspec.fetch('version') do
+                  lib_dir = File.join(File.dirname(__FILE__),'lib')
+                  $LOAD_PATH << lib_dir unless $LOAD_PATH.include?(lib_dir)
 
-  gemspec.name    = metadata['name']
-  gemspec.version = if metadata['version']
-                      metadata['version']
-                    else
-                      $LOAD_PATH << lib_dir unless $LOAD_PATH.include?(lib_dir)
+                  require 'yasm/version'
+                  YASM::VERSION
+                end
 
-                      require version[:file]
-                      eval(version[:constant])
-                    end
+  gem.summary     = gemspec['summary']
+  gem.description = gemspec['description']
+  gem.licenses    = Array(gemspec['license'])
+  gem.authors     = Array(gemspec['authors'])
+  gem.email       = gemspec['email']
+  gem.homepage    = gemspec['homepage']
+  gem.metadata    = gemspec['metadata'] if gemspec['metadata']
 
-  gemspec.summary     = metadata.fetch('summary',metadata['description'])
-  gemspec.description = metadata.fetch('description',metadata['summary'])
+  glob = lambda { |patterns| gem.files & Dir[*patterns] }
 
-  gemspec.licenses = Array(metadata['license'])
-  gemspec.authors  = Array(metadata['authors'])
+  gem.files = if gemspec['files'] then glob[gemspec['files']]
+              else                     `git ls-files`.split($/)
+              end
 
-  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
+  gem.executables = gemspec.fetch('executables') do
+    glob['bin/*'].map { |path| File.basename(path) }
   end
 
-  gemspec.test_files       = filter_files[metadata['test_files']]
-  gemspec.extra_rdoc_files = Array(metadata['extra_doc_files'])
+  gem.extensions       = glob[gemspec['extensions'] || 'ext/**/extconf.rb']
+  gem.extra_rdoc_files = glob[gemspec['extra_doc_files'] || '*.{txt,md}']
 
-  gemspec.post_install_message = metadata['post_install_message']
-  gemspec.requirements         = metadata['requirements']
+  gem.require_paths = Array(gemspec.fetch('require_paths') {
+    %w[ext lib].select { |dir| File.directory?(dir) }
+  })
 
-  if gemspec.respond_to?(:required_ruby_version=)
-    gemspec.required_ruby_version = metadata['required_ruby_version']
-  end
+  gem.requirements              = gemspec['requirements']
+  gem.required_ruby_version     = gemspec['required_ruby_version']
+  gem.required_rubygems_version = gemspec['required_rubygems_version']
+  gem.post_install_message      = gemspec['post_install_message']
 
-  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
+  split = lambda { |string| string.split(/,\s*/) }
 
-  if metadata['runtime_dependencies']
-    metadata['runtime_dependencies'].each do |name,versions|
-      gemspec.add_runtime_dependency(name,parse_versions[versions])  
+  if gemspec['dependencies']
+    gemspec['dependencies'].each do |name,versions|
+      gem.add_dependency(name,split[versions])
     end
   end
 
-  if metadata['development_dependencies']
-    metadata['development_dependencies'].each do |name,versions|
-      gemspec.add_development_dependency(name,parse_versions[versions])  
+  if gemspec['development_dependencies']
+    gemspec['development_dependencies'].each do |name,versions|
+      gem.add_development_dependency(name,split[versions])
     end
   end
 end

data/spec/command_spec.rb

@@ -0,0 +1,91 @@
+require 'spec_helper'
+require 'helpers/files'
+
+require 'yasm/command'
+require 'tempfile'
+
+describe YASM::Command do
+  include Helpers::Files
+
+  describe ".run" do
+    subject { described_class }
+
+    it "should be able to assemble a file" do
+      file = Tempfile.new('yasm').path
+
+      subject.run do |yasm|
+        yasm.target = :x86
+        yasm.syntax = :gas
+        yasm.file = assembly_file('gas')
+        yasm.output = file
+      end
+
+      expect(File.size(file)).to be > 0
+    end
+  end
+
+  describe "#target" do
+    context "when no target has been set" do
+      it "must return nil" do
+        expect(subject.target).to be(nil)
+      end
+    end
+
+    context "when the target has been set to :x86" do
+      before { subject.target = :x86 }
+
+      it "must return :x86" do
+        expect(subject.target).to eq(:x86)
+      end
+    end
+
+    context "when #arch is :x86 and #machine is :x86" do
+      before do
+        subject.arch    = :x86
+        subject.machine = :x86
+      end
+
+      it "must return :x86" do
+        expect(subject.target).to eq(:x86)
+      end
+    end
+
+    context "when the target has been set to :amd64" do
+      before { subject.target = :amd64}
+
+      it "must return :amd64" do
+        expect(subject.target).to eq(:amd64)
+      end
+    end
+
+    context "when #arch is :x86 and #machine is :amd64" do
+      before do
+        subject.arch    = :x86
+        subject.machine = :amd64
+      end
+
+      it "must return :amd64" do
+        expect(subject.target).to eq(:amd64)
+      end
+    end
+
+    context "when the target has been set to :lc3b" do
+      before { subject.target = :lc3b}
+
+      it "must return :lc3b" do
+        expect(subject.target).to eq(:lc3b)
+      end
+    end
+
+    context "when #arch is :lc3b and #machine is :lc3b" do
+      before do
+        subject.arch    = :lc3b
+        subject.machine = :lc3b
+      end
+
+      it "must return :lc3b" do
+        expect(subject.target).to eq(:lc3b)
+      end
+    end
+  end
+end

data/spec/program_spec.rb

@@ -4,22 +4,101 @@ require 'helpers/files'
 require 'yasm/program'
 require 'tempfile'
 
-describe Program do
+describe YASM::Program do
   include Helpers::Files
 
-  subject { described_class.find }
+  describe ".assemble" do
+    subject { described_class }
 
-  it "should be able to assemble a file" do
-    file = Tempfile.new('yasm').path
+    it "should be able to assemble a file" do
+      file = Tempfile.new('yasm').path
 
-    subject.assemble do |yasm|
-      yasm.target! :x86
+      subject.assemble do |yasm|
+        yasm.target! :x86
 
-      yasm.syntax = :gas
-      yasm.file = assembly_file('gas')
-      yasm.output = file
+        yasm.syntax = :gas
+        yasm.file = assembly_file('gas')
+        yasm.output = file
+      end
+
+      expect(File.size(file)).to be > 0
+    end
+  end
+
+  describe "#assemble" do
+    it "should be able to assemble a file" do
+      file = Tempfile.new('yasm').path
+
+      subject.assemble do |yasm|
+        yasm.target! :x86
+
+        yasm.syntax = :gas
+        yasm.file = assembly_file('gas')
+        yasm.output = file
+      end
+
+      expect(File.size(file)).to be > 0
+    end
+  end
+
+  describe "#initialize" do
+    subject { described_class.new(target: :amd64) }
+
+    it "should support a :target option" do
+      expect(subject.arch).to eq(:x86)
+      expect(subject.machine).to eq(:amd64)
+    end
+  end
+
+  describe "#target!" do
+    it "should return true for valid targets" do
+      expect(subject.target!(:amd64)).to be(true)
     end
 
-    File.size(file).should > 0
+    context "when given an unknown target name" do
+      let(:name) { :lol }
+
+      it "should raise ArgumentError when passed unknown targets" do
+        expect {
+          subject.target!(name)
+        }.to raise_error(ArgumentError,"unknown YASM target: #{name.inspect}")
+      end
+    end
+
+    context "when given :x86" do
+      before { subject.target!(:x86) }
+
+      it "should set the #arch value" do
+        expect(subject.arch).to eq(:x86)
+      end
+
+      it "should set the #machine value" do
+        expect(subject.machine).to eq(:x86)
+      end
+    end
+
+    context "when given :amd64" do
+      before { subject.target!(:amd64) }
+
+      it "should set the #arch value" do
+        expect(subject.arch).to eq(:x86)
+      end
+
+      it "should set the #machine value" do
+        expect(subject.machine).to eq(:amd64)
+      end
+    end
+
+    context "when given :lc3b" do
+      before { subject.target!(:lc3b) }
+
+      it "should set the #arch value" do
+        expect(subject.arch).to eq(:lc3b)
+      end
+
+      it "should set the #machine value" do
+        expect(subject.machine).to eq(:lc3b)
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
-require 'rubygems'
-gem 'rspec', '~> 2.4'
 require 'rspec'
+require 'simplecov'
+SimpleCov.start
 
 require 'yasm/version'
-
 include YASM

data/spec/yasm_spec.rb

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

metadata

@@ -1,80 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: ruby-yasm
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Postmodern
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000 Z
+date: 2022-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rprogram
+  name: command_mapper
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  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:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.0'
   type: :development
   prerelease: false
   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:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '2.0'
 description: ruby-yasm provides a Ruby interface to YASM assembler.
 email: postmodern.mod3@gmail.com
 executables: []
@@ -84,55 +47,52 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
-- .gemtest
-- .gitignore
-- .rspec
-- .specopts
-- .yardopts
+- ".document"
+- ".gemtest"
+- ".github/workflows/ruby.yml"
+- ".gitignore"
+- ".rspec"
+- ".specopts"
+- ".yardopts"
 - ChangeLog.md
+- Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - gemspec.yml
 - lib/yasm.rb
+- lib/yasm/command.rb
 - lib/yasm/program.rb
-- lib/yasm/task.rb
 - lib/yasm/version.rb
 - ruby-yasm.gemspec
+- spec/command_spec.rb
 - 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
-homepage: https://github.com/sophsec/ruby-yasm#readme
+homepage: https://github.com/postmodern/ruby-yasm#readme
 licenses:
 - MIT
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - yasm >= 0.6.0
-rubyforge_project: 
-rubygems_version: 1.8.24
-signing_key: 
-specification_version: 3
+rubygems_version: 3.2.22
+signing_key:
+specification_version: 4
 summary: A Ruby interface to YASM.
-test_files:
-- spec/program_spec.rb
-- spec/task_spec.rb
-- spec/yasm_spec.rb
+test_files: []

data/lib/yasm/task.rb

@@ -1,153 +0,0 @@
-require 'rprogram/task'
-
-module YASM
-  #
-  # ## YASM options:
-  #
-  # * `--version` -  `yasm.version`
-  # * `--license` -  `yasm.license`
-  # * `--help` -  `yasm.help`
-  #
-  # * `--arch` -  `yasm.arch`
-  # * `--parser` -  `yasm.parser`
-  # * `--preproc` -  `yasm.preprocessor`
-  # * `--oformat` -  `yasm.output_format`
-  # * `--dformat` -  `yasm.debug_format`
-  # * `--lformat` -  `yasm.list_format`
-  #
-  # * `--list` -  `yasm.list_file`
-  # * `--objfile` -  `yasm.output`
-  # * `--mapfile` -  `yasm.map_file`
-  #
-  # * `--machine` -  `yasm.machine`
-  # * `--force-strict` -  `yasm.force_strict`
-  # * `-w` -  `yasm.inhibit_warnings`
-  # * `-W` -  `yasm.toggle_warnings`
-  # * `-M` -  `yasm.gen_makefile_deps`
-  # * `-E` -  `yasm.redirect_errors_to`
-  # * `-e` -  `yasm.redirect_errors`
-  # * `--preproc-only` -  `yasm.preprocessor_only`
-  # * `-I` -  `yasm.include`
-  # * `-P` -  `yasm.pre_include`
-  # * `-D` -  `yasm.define`
-  # * `-U` -  `yasm.undefine`
-  # * `-X` -  `yasm.message_style`
-  # * `--prefix` -  `yasm.prefix`
-  # * `--suffix` -  `yasm.suffix`
-  #
-  # * `file` -  `yasm.file`
-  #
-  class Task < RProgram::Task
-
-    # The known YASM targets
-    TARGETS = {
-      :x86   => {:arch => :x86, :machine => :x86},
-      :amd64 => {:arch => :x86, :machine => :amd64},
-      :lc3b  => {:arch => :lc3b, :machine => :lc3b}
-    }
-
-    long_option :flag => '--version'
-    long_option :flag => '--license'
-    long_option :flag => '--help'
-
-    long_option :flag => '--arch', :equals => true
-    long_option :flag => '--parser', :equals => true
-    long_option :flag => '--preproc',
-                :equals => true,
-                :name => :preprocessor
-    long_option :flag => '--oformat',
-                :equals => true,
-                :name => :output_format
-    long_option :flag => '--dformat',
-                :equals => true,
-                :name => :debug_format
-    long_option :flag => '--lformat',
-                :equals => true,
-                :name => :list_format
-
-    long_option :flag => '--list',
-                :equals => true,
-                :name => :list_file
-    long_option :flag => '--objfile',
-                :equals => true,
-                :name => :output
-    long_option :flag => '--mapfile',
-                :equals => true,
-                :name => :map_file
-
-    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
-    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'
-
-    non_option :tailing => true, :name => :file
-
-    #
-    # Creates a new Task object.
-    #
-    # @param [Hash{Symbol => Object}] options
-    #   Additional options for the task.
-    #
-    # @option options [String, Symbol] :target
-    #   The arch/machine to target.
-    #
-    # @yield [task]
-    #   If a block is given, it will be passed the newly created task
-    #   object.
-    #
-    # @yieldparam [Task] task
-    #   The new task object.
-    #
-    # @see Task#target!
-    #
-    def initialize(options={},&block)
-      target = options.delete(:target)
-
-      super(options,&block)
-
-      target!(target) if target
-    end
-
-    #
-    # Sets the YASM `arch` and `machine`.
-    #
-    # @param [String, Symbol] name
-    #   The target name.
-    #
-    # @raise [ArgumentError]
-    #   The specified target is unknown.
-    #
-    # @return [true]
-    #   The YASM `arch` and `machine` options were set successfully.
-    #
-    # @example
-    #   yasm.target! :amd64
-    #
-    def target!(name)
-      target = TARGETS[name.to_sym]
-
-      unless target
-        raise(ArgumentError,"unknown YASM target #{name.inspect}")
-      end
-
-      self.arch    = target[:arch]
-      self.machine = target[:machine]
-      return true
-    end
-
-    alias syntax parser
-    alias syntax= parser=
-
-  end
-end