Finish 2.0.0.beta2

Author: gkellogg

CONTRIBUTING.md

@@ -0,0 +1,36 @@
+# How to contribute
+
+Community contributions are essential for keeping Ruby RDF great. We want to keep it as easy as possible to contribute changes that get things working in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
+
+## Development
+
+This repository uses [Git Flow](https://github.com/nvie/gitflow) to manage development and release activity. All submissions _must_ be on a feature branch based on the _develop_ branch to ease staging and integration.
+
+* create or respond to an issue on the [Github Repository](http://github.com/ruby-rdf/rdf/issues)
+* Fork and clone the repo:
+  `git clone git@github.com:your-username/rdf.git`
+* Install bundle:
+  `bundle install`
+* Create tests in RSpec and make sure you achieve at least 90% code coverage for the feature your adding or behavior being modified.
+* Push to your fork and [submit a pull request][pr].
+
+## Do's and Dont's
+* Do your best to adhere to the existing coding conventions and idioms.
+* Don't use hard tabs, and don't leave trailing whitespace on any line.
+  Before committing, run `git diff --check` to make sure of this.
+* Do document every method you add using [YARD][] annotations. Read the
+  [tutorial][YARD-GS] or just look at the existing code for examples.
+* Don't touch the `.gemspec` or `VERSION` files. If you need to change them,
+  do so on your private branch only.
+* Do feel free to add yourself to the `CREDITS` file and the
+  corresponding list in the the `README`. Alphabetical order applies.
+* Don't touch the `AUTHORS` file. If your contributions are significant
+  enough, be assured we will eventually add you in there.
+* Do note that in order for us to merge any non-trivial changes (as a rule
+  of thumb, additions larger than about 15 lines of code), we need an
+  explicit [public domain dedication][PDD] on record from you.
+
+[YARD]:    http://yardoc.org/
+[YARD-GS]: http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
+[PDD]:     http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html
+[pr]:      https://github.com/ruby-rdf/rdf/compare/

README.md

@@ -79,12 +79,13 @@ Notably, {RDF::Queryable#query} and {RDF::Query#execute} are now completely symm
 When installed, RDF.rb includes a `rdf` shell script which acts as a wrapper to perform a number of different
 operations on RDF files using available readers and writers.
 
-* `serialize`: Parse an RDF input and re-serializing to [N-Triples][] or another available format using `--output-format` option.
 * `count`: Parse and RDF input and count the number of statements.
-* `subjects`: Returns unique subjects from parsed input.
-* `objects`: Returns unique objects from parsed input.
 * `predicates`: Returns unique objects from parsed input.
+* `objects`: Returns unique objects from parsed input.
+* `serialize`: Parse an RDF input and re-serializing to [N-Triples][] or another available format using `--output-format` option.
+* `subjects`: Returns unique subjects from parsed input.
 
+The `serialize` command can also be used to serialize as a vocabulary
 ## Examples
 
     require 'rdf'

Rakefile

@@ -35,8 +35,7 @@ task :doap do
   sh "bin/rdf serialize etc/doap.ttl --output etc/doap.nt"
 end
 
-require 'linkeddata'
-require 'rdf/cli/vocab-loader'
+require 'rdf/vocab/writer'
 
 desc "Generate Vocabularies"
 vocab_sources = {
@@ -72,18 +71,16 @@ task gen_vocabs: vocab_sources.keys.map {|v| "lib/rdf/vocab/#{v}.rb"}
 vocab_sources.each do |id, v|
   file "lib/rdf/vocab/#{id}.rb" => :do_build do
     puts "Generate lib/rdf/vocab/#{id}.rb"
+    cmd = "bin/rdf serialize --uri '#{v[:uri]}' --output-format vocabulary"
+    cmd += " --class-name #{id.to_s.upcase}"
+    cmd += " -o lib/rdf/vocab/#{id}.rb_t"
+    cmd += " --strict" if v.fetch(:strict, true)
+    cmd += " '" + v.fetch(:source, v[:uri]) + "'"
+    puts "  #{cmd}"
     begin
-      out = StringIO.new
-      loader = RDF::VocabularyLoader.new(id.to_s.upcase)
-      loader.uri = v[:uri]
-      loader.source = v[:source] if v[:source]
-      loader.extra = v[:extra] if v[:extra]
-      loader.strict = v.fetch(:strict, true)
-      loader.output = out
-      loader.run
-      out.rewind
-      File.open("lib/rdf/vocab/#{id}.rb", "w") {|f| f.write out.read}
+      %x{#{cmd} && mv lib/rdf/vocab/#{id}.rb_t lib/rdf/vocab/#{id}.rb}
     rescue
+      %x{rm -f lib/rdf/vocab/#{id}.rb_t}
       puts "Failed to load #{id}: #{$!.message}"
     end
   end

VERSION

@@ -1 +1 @@
-2.0.0.beta1
+2.0.0.beta2

bin/rdf

@@ -11,8 +11,19 @@ options = RDF::CLI.options do
   self.on('-V', '--version', 'Display the RDF.rb version and exit.') do
     puts RDF::VERSION; exit
   end
+
+  ARGV.select {|a| RDF::CLI.commands.include?(a)}.each do |cmd|
+    # Load command-specific options
+    Array(RDF::CLI::COMMANDS[cmd.to_sym][:options]).each do |cli_opt|
+      on_args = cli_opt.on || []
+      on_args << cli_opt.description if cli_opt.description
+      self.on(*on_args) do |arg|
+        self.options[cli_opt.symbol] = cli_opt.call(arg)
+      end
+    end
+  end
 end
 
 abort options.banner if ARGV.empty? && !options.options[:evaluate]
 
-RDF::CLI.exec_command(command = ARGV.shift, ARGV, options.options)
+RDF::CLI.exec(ARGV, options.options)