ruby_ami 1.2.5 → 1.2.6

data/.travis.yml

@@ -3,8 +3,8 @@ rvm:
   - 1.9.2
   - 1.9.3
   - jruby-19mode
-  # - rbx-19mode
-  # - ruby-head
+  - rbx-19mode
+  - ruby-head
 before_install:
   - wget http://ftp.us.debian.org/debian/pool/main/r/ragel/ragel_6.7-1.1_i386.deb
   - sudo dpkg -i ragel_6.7-1.1_i386.deb

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # [develop](https://github.com/adhearsion/ruby_ami)
 
+# [1.2.6](https://github.com/adhearsion/ruby_ami/compare/v1.2.5...v1.2.6) - [2012-12-26](https://rubygems.org/gems/ruby_ami/versions/1.2.6)
+  * Bugfix: JRuby and rbx compatability
+
 # [1.2.5](https://github.com/adhearsion/ruby_ami/compare/v1.2.4...v1.2.5) - [2012-10-24](https://rubygems.org/gems/ruby_ami/versions/1.2.5)
   * Bugfix: Log wire stuff at trace level
 

data/Rakefile

@@ -2,7 +2,6 @@ require 'bundler/gem_tasks'
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
-require 'ci/reporter/rake/rspec'
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rspec_opts = '--color'
@@ -10,7 +9,6 @@ end
 
 require 'cucumber'
 require 'cucumber/rake/task'
-require 'ci/reporter/rake/cucumber'
 Cucumber::Rake::Task.new(:features) do |t|
   t.cucumber_opts = %w{--tags ~@jruby} unless defined?(JRUBY_VERSION)
 end
@@ -20,7 +18,6 @@ Cucumber::Rake::Task.new(:wip) do |t|
 end
 
 task :default => [:ragel, :spec, :features]
-task :ci => [:ragel, 'ci:setup:rspec', :spec, 'ci:setup:cucumber', :features]
 
 require 'yard'
 YARD::Rake::YardocTask.new

data/features/support/env.rb

@@ -1,16 +1,3 @@
-require 'simplecov'
-require 'simplecov-rcov'
-class SimpleCov::Formatter::MergedFormatter
-  def format(result)
-     SimpleCov::Formatter::HTMLFormatter.new.format(result)
-     SimpleCov::Formatter::RcovFormatter.new.format(result)
-  end
-end
-SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
-SimpleCov.start do
-  add_filter "/vendor/"
-end
-
 require 'cucumber'
 require 'rspec'
 require 'ruby_ami'

data/lib/ruby_ami/lexer.rb

@@ -35,7 +35,7 @@ module RubyAMI
 
     def initialize(delegate = nil)
       @delegate = delegate
-      @data = ''.encode('ISO-8859-1', 'ISO-8859-1')
+      @data = ''.force_encoding('ISO-8859-1')
       @current_pointer = 0
       @ragel_stack = []
       @ami_version = 0.0
@@ -1465,7 +1465,7 @@ end
         @data.slice! 0...length
         adjust_pointers -length
       end
-      @data << new_data.encode('ISO-8859-1', 'ISO-8859-1')
+      @data << new_data.force_encoding('ISO-8859-1')
       @data_ending_pointer = @data.size
     end
 

data/lib/ruby_ami/lexer.rl.rb

@@ -72,7 +72,7 @@ module RubyAMI
 
     def initialize(delegate = nil)
       @delegate = delegate
-      @data = ''.encode('ISO-8859-1', 'ISO-8859-1')
+      @data = ''.force_encoding('ISO-8859-1')
       @current_pointer = 0
       @ragel_stack = []
       @ami_version = 0.0
@@ -125,7 +125,7 @@ module RubyAMI
         @data.slice! 0...length
         adjust_pointers -length
       end
-      @data << new_data.encode('ISO-8859-1', 'ISO-8859-1')
+      @data << new_data.force_encoding('ISO-8859-1')
       @data_ending_pointer = @data.size
     end
 

data/lib/ruby_ami/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module RubyAMI
-  VERSION = "1.2.5"
+  VERSION = "1.2.6"
 end

data/ruby_ami.gemspec

@@ -26,12 +26,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency %q<bundler>, ["~> 1.0"]
   s.add_development_dependency %q<rspec>, ["~> 2.5"]
   s.add_development_dependency %q<cucumber>, [">= 0"]
-  s.add_development_dependency %q<ci_reporter>, ["~> 1.6"]
   s.add_development_dependency %q<yard>, ["~> 0.6"]
   s.add_development_dependency %q<rake>, [">= 0"]
   s.add_development_dependency %q<mocha>, [">= 0"]
-  s.add_development_dependency %q<simplecov>, [">= 0"]
-  s.add_development_dependency %q<simplecov-rcov>, [">= 0"]
   s.add_development_dependency %q<guard-rspec>
   s.add_development_dependency %q<guard-shell>
   s.add_development_dependency %q<ruby_gntp>

data/spec/spec_helper.rb

@@ -1,22 +1,4 @@
 # encoding: utf-8
-begin
-  require 'simplecov'
-  require 'simplecov-rcov'
-  class SimpleCov::Formatter::MergedFormatter
-    def format(result)
-       SimpleCov::Formatter::HTMLFormatter.new.format(result)
-       SimpleCov::Formatter::RcovFormatter.new.format(result)
-    end
-  end
-  SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
-  SimpleCov.start do
-    add_filter "/vendor/"
-  end
-rescue Exception => e
-  puts "Couldn't load simplecov"
-  puts e.message
-  puts e.backtrace.join("\n")
-end
 
 require 'ruby_ami'
 require 'countdownlatch'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ami
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-24 00:00:00.000000000 Z
+date: 2012-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io
@@ -123,22 +123,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ci_reporter
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -187,38 +171,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov-rcov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -331,7 +283,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2320408873342490839
+      hash: -1351275234021844884
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -340,10 +292,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2320408873342490839
+      hash: -1351275234021844884
 requirements: []
 rubyforge_project: ruby_ami
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Futzing with AMI so you don't have to