spnet 0.1.1 → 0.1.2

data/.gitignore

@@ -1,20 +1,8 @@
-*.gem
-*.rbc
-<<<<<<< HEAD
-=======
 Gemfile.lock
->>>>>>> d63c31673acdeec0c776db6fc0cb787ff73a0d7a
-.bundle
-.config
-coverage
-InstalledFiles
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+
+# Gem artifacts
+pkg/
+vendor/cache/*.gem
 
 # YARD artifacts
 .yardoc

data/ChangeLog.rdoc

@@ -2,3 +2,13 @@
 
 * Initial release:
 
+=== 0.1.1 / 2013-02-03
+
+Updated to use hashmake 0.1.1 gem.
+
+=== 0.1.2 / 2013-02-04
+
+* Update project files, including:
+** Removing README.md so that YARD can run without needing the redcarpet gem.
+** Removing unnecessary lines from .gitignore
+** Remove specific hashmake version in hashmake.gemspec

data/lib/spnet/version.rb

@@ -1,4 +1,4 @@
 module SPNet
   # spnet version
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spnet.gemspec

@@ -19,7 +19,7 @@ DESCRIPTION
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'hashmake', '~> 0.1.1'
+  gem.add_dependency 'hashmake'
 
   gem.add_development_dependency 'bundler', '~> 1.0'
   gem.add_development_dependency 'rake', '~> 0.8'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spnet
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -16,17 +16,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,6 @@ files:
 - ChangeLog.rdoc
 - Gemfile
 - LICENSE.txt
-- README.md
 - README.rdoc
 - Rakefile
 - lib/spnet.rb
@@ -159,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -47610687
+      hash: 402444883
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -168,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -47610687
+      hash: 402444883
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/README.md

@@ -1,11 +0,0 @@
-<<<<<<< HEAD
-spnet
-=========
-
-Infrastructure for forming signal processing networks.
-=======
-spnet
-=======
-
-Infrastructure for forming signal processing networks.
->>>>>>> d63c31673acdeec0c776db6fc0cb787ff73a0d7a