code2rubylearning 0.1.3 → 0.1.4

data/Gemfile

@@ -41,5 +41,6 @@ group :test do
   gem 'guard-minitest', '0.5.0'
   gem 'guard', "~> 1.6.0"
   gem 'guard-rspec', "~> 2.3.1"
+  gem 'simplecov', :require => false, :group => :test
 end
 

data/README.md

@@ -1,24 +1,22 @@
 # Code2rubylearning
 command line tool that formats, given source code files, making them ready for pasting to the rubylearning.org forum. 
 
-# Under Development
 ## Installation
+    gem install code2rubylearning
+    
+Or add this line to your application's Gemfile:
 
-Add this line to your application's Gemfile:
-
-    gem 'code2rubylearning', :git => "https://github.com/rudicode/code2rubylearning.git", :branch => "master"
-
-And then execute:
+    gem "code2rubylearning", "~> 0.1.3"
 
-    $ bundle
-This should install clippy 1.0.1 as well.
+And then :
+    bundle install
+    
+## Usage:
 
-To see if it works
+    $ code2rubylearning [options] file1 file2 file3 ...
 
-    $ bundle exec code2rubylearning
+Check your clipboard, the files should be ready to paste to the forum.
 
-This should copy the text string "Text to copy to clip board." to your clipboard.
-    
 ## Contributing
 
 1. Fork it

data/bin/code2rubylearning

@@ -3,33 +3,42 @@
 require 'optparse'
 require 'code2rubylearning'
 
-options = {}
-
-optparse = OptionParser.new do|opt|
-  opt.banner = "code2rubylearning version: #{ Code2rubylearning::VERSION }\n\nUsage: code2rubylearning [options] file1 file2 ..."
-
-  # options
-  options[:stdout] = false
-  opt.on( '-s', '--stdout', 'Output to stdout' ) do
-    options[:stdout] = true
-  end
-
-  options[:combine] = false
-  opt.on( '-c', '--combine', 'Combine multiple files into one ( not yet implemented )' ) do
-    options[:combine] = true
+begin
+  options = {}
+
+  optparse = OptionParser.new do|opt|
+    opt.banner = "code2rubylearning version: #{ Code2rubylearning::VERSION }\n\nUsage: code2rubylearning [options] file1 file2 ..."
+
+    # options
+    options[:stdout] = false
+    opt.on( '-s', '--stdout', 'Output to stdout' ) do
+      options[:stdout] = true
+    end
+
+    options[:combine] = false
+    opt.on( '-c', '--combine', 'Combine multiple files into one ( not yet implemented )' ) do
+      options[:combine] = true
+    end
+
+    options[:filenames] = true
+    opt.on( '-f', '--nofilenames', 'Suppress filename line in output' ) do
+      options[:filenames] = false
+    end
+
+    opt.on( '-h', '--help', 'Display help screen' ) do
+      puts opt
+      exit 1
+    end
   end
 
-  options[:filenames] = true
-  opt.on( '-f', '--nofilenames', 'Suppress filename line in output' ) do
-    options[:filenames] = false
-  end
+  optparse.parse! ARGV
 
-  opt.on( '-h', '--help', 'Display help screen' ) do
-    puts opt
+  if ARGV.empty?
+    puts optparse
     exit 1
   end
-end
-begin optparse.parse! ARGV
+
+  Code2rubylearning.start ARGV, options
 
 rescue OptionParser::InvalidOption => e
   puts e
@@ -37,10 +46,3 @@ rescue OptionParser::InvalidOption => e
   exit 1
 end
 
-if ARGV.empty?
-  puts optparse
-  exit 1
-end
-
-Code2rubylearning.start ARGV, options
-

data/lib/code2rubylearning/version.rb

@@ -1,3 +1,3 @@
 module Code2rubylearning
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/code2rubylearning.rb

@@ -2,16 +2,12 @@ require 'clippy'
 require 'code2rubylearning/version'
 require 'code2rubylearning/filter'
 require 'code2rubylearning/filehandling'
-require 'code2rubylearning/parse_cli'
 
 module Code2rubylearning
 
   extend self
 
-  def start args, options
-    ParseCLI.parse args
-    files   = ParseCLI.files
-    # options = ParseCLI.options
+  def start files, options
     @buffer = ""
 
     files.each do |file|

data/spec/assets/file-1.rb

@@ -0,0 +1,3 @@
+def hello
+  "Hello"
+end

data/spec/assets/file-2.rb

@@ -0,0 +1,3 @@
+def there
+  "There"
+end

data/spec/code2rubylearning_spec.rb

@@ -2,5 +2,30 @@ require "spec_helper"
 
 describe Code2rubylearning do
 
+  it "should convert a single file" do
+    files = ["spec/assets/file-1.rb"]
+    options = { :stdout => false }
+    Code2rubylearning.start files, options
+
+    # check if clipboard contents equal converted file
+    # be careful clippy adds \r to new lines ( see clippy docs )
+    from_clipboard = Clippy.paste
+    from_clipboard.must_equal "[code ruby]\r\ndef hello\r\n  \"Hello\"\r\nend\r\n[/code]\r\n"
+
+  end
+
+  it "should convert multiple files" do
+    files = ["spec/assets/file-1.rb", "spec/assets/file-2.rb"]
+    options = { :stdout => false }
+    Code2rubylearning.start files, options
+
+    # check if clipboard contents equal converted file
+    # be careful clippy adds \r to new lines ( see clippy docs )
+    from_clipboard = Clippy.paste
+    correct_response = "[code ruby]\r\ndef hello\r\n  \"Hello\"\r\nend\r\n[/code]\r\n[code ruby]\r\ndef there\r\n  \"There\"\r\nend\r\n[/code]\r\n"
+    from_clipboard.must_equal correct_response
+
+  end
+
 
 end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'simplecov'
+SimpleCov.start
+SimpleCov.command_name 'MiniTest:specs'
 require "rubygems"
 require "bundler/setup"
 require 'minitest/autorun'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code2rubylearning
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -48,11 +48,11 @@ files:
 - lib/code2rubylearning.rb
 - lib/code2rubylearning/filehandling.rb
 - lib/code2rubylearning/filter.rb
-- lib/code2rubylearning/parse_cli.rb
 - lib/code2rubylearning/version.rb
+- spec/assets/file-1.rb
+- spec/assets/file-2.rb
 - spec/code2rubylearning/filehandling_spec.rb
 - spec/code2rubylearning/filter_spec.rb
-- spec/code2rubylearning/parse_cli_spec.rb
 - spec/code2rubylearning/version_spec.rb
 - spec/code2rubylearning_spec.rb
 - spec/spec_helper.rb
@@ -70,7 +70,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -616480127
+      hash: -949178893
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -616480127
+      hash: -949178893
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -88,9 +88,10 @@ specification_version: 3
 summary: command line tool that formats, given source code files, making them ready
   for pasting to the rubylearning.org forum.
 test_files:
+- spec/assets/file-1.rb
+- spec/assets/file-2.rb
 - spec/code2rubylearning/filehandling_spec.rb
 - spec/code2rubylearning/filter_spec.rb
-- spec/code2rubylearning/parse_cli_spec.rb
 - spec/code2rubylearning/version_spec.rb
 - spec/code2rubylearning_spec.rb
 - spec/spec_helper.rb

data/lib/code2rubylearning/parse_cli.rb

@@ -1,23 +0,0 @@
-module Code2rubylearning
-  module ParseCLI
-    
-    extend self
-
-    attr_reader :files, :options
-
-    def parse args
-      @files = []
-      @options = []
-      @args = args
-
-      @args.each do |arg|
-        if arg.include?('-')
-          @options << arg
-        else
-          @files << arg
-        end
-      end
-    end
-  
-  end
-end

data/spec/code2rubylearning/parse_cli_spec.rb

@@ -1,20 +0,0 @@
-require "spec_helper"
-
-describe "ParseCLI" do
-  before :each do
-    #
-  end
-
-  describe ".parse" do
-    it "should parse command line into files and options" do
-      cmd_line         = ['file1.rb', '-b', '--help', 'file2.rb', 'file3.txt']
-
-      expected_files   = ['file1.rb', 'file2.rb', 'file3.txt']
-      expected_options = ['-b', '--help']
-      ParseCLI.parse cmd_line
-      ParseCLI.files.must_equal   expected_files
-      ParseCLI.options.must_equal expected_options
-    end
-  end
-
-end