code2rubylearning 0.1.6 → 0.1.7

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Rudi Luzar
+Copyright (c) 2012-2013 Rudi Luzar
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/bin/code2rubylearning

@@ -30,6 +30,11 @@ begin
       options[:prg_link] = false
     end
 
+    options[:linenumbers] = false
+    opt.on( '-l', '--linenumbers', 'Add line number option to code header' ) do
+      options[:linenumbers] = true
+    end
+
     opt.on( '-h', '--help', 'Display help screen' ) do
       puts opt
       exit 1

data/lib/code2rubylearning.rb

@@ -21,8 +21,12 @@ module Code2rubylearning
     if options[:prg_link]
       @buffer << "<a href=\"https://github.com/rudicode/code2rubylearning/wiki\">Posted with code2rubylearning v#{ VERSION }</a>\n"
     end
+
     Clippy.copy @buffer unless @buffer.empty?
     puts @buffer if options[:stdout]
+
+    @buffer
+
   end
 
 end

data/lib/code2rubylearning/filehandling.rb

@@ -29,6 +29,5 @@ module Code2rubylearning
     def identify_file_type
       @type = "ruby"
     end
-
   end
 end

data/lib/code2rubylearning/filter.rb

@@ -2,22 +2,35 @@ module Code2rubylearning
   class Filter
     def initialize current_file, options
       @current_file = current_file
+      @name = current_file.name
+      @data = current_file.data
+      @type = current_file.type
       @options = options
     end
 
-    def apply #input, file_name
-      # add_header(file_name) << convert(input) << add_footer
-      add_header(@current_file.name) << convert(@current_file.data) << add_footer
+    def apply
+      header(@name) << convert(@data) << footer
     end
 
-    def add_header file_name
-      type = @current_file.type 
-      header = "[code #{ type }]\n"
-      header << "#filename: #{ file_name }\n" if @options[:filenames]
+    def header file_name
+      header = "[code #{ @type }#{@options[:linenumbers] ? ' linenumbers' : ''}]\n"
+      if @options[:filenames]
+
+        data_lines = @data.split("\n")
+
+        if data_lines.first.include? "#!"
+          bin_line = data_lines.first + "\n"
+          header << bin_line
+          @data = @data.gsub(bin_line, "")
+        end
+
+        header << "#filename: #{ file_name }\n"
+
+      end
       header
     end
 
-    def add_footer
+    def footer
       "[/code]\n"
     end
 

data/lib/code2rubylearning/version.rb

@@ -1,3 +1,3 @@
 module Code2rubylearning
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/assets/file-3.rb

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+def there
+  "There"
+end

data/spec/code2rubylearning/filter_spec.rb

@@ -41,15 +41,22 @@ describe "Filter" do
       @filter = Filter.new(@original_file, @options)
     end
 
-    it "should add [code ruby] to original string" do
+    it "should add [code ruby] to header" do
       expected = "[code ruby]\n"
       @filter.apply.must_include expected
     end
 
-    it "should add [/code] to original string" do
+    it "should add [/code] to footer" do
       expected = "[/code]\n"
       @filter.apply.must_include expected
     end
+
+    it "should add 'linenumbers to header" do
+      @options[:linenumbers] = true
+      expected = "[code ruby linenumbers]"
+      @filter.apply.must_include expected
+    end
+
   end
 
 end

data/spec/code2rubylearning_spec.rb

@@ -7,22 +7,16 @@ describe Code2rubylearning do
 
   it "should convert a single file" do
     files = ["spec/assets/file-1.rb"]
-    Code2rubylearning.start files, @options
+    from_clipboard = 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"]
-    Code2rubylearning.start files, @options
+    from_clipboard = 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
 
@@ -31,14 +25,46 @@ describe Code2rubylearning do
   it "should add a program link to the end if :prg_link is true" do
     @options = { :prg_link => true }
     files = ["spec/assets/file-1.rb", "spec/assets/file-2.rb"]
-    Code2rubylearning.start files, @options
+    from_clipboard = 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 = "<a href=\"https://github.com/rudicode/code2rubylearning/wiki\">Posted with code2rubylearning v"
     from_clipboard.must_include correct_response
 
   end
 
+  describe "filename option true" do
+
+  before :each do
+      @options = { :filenames => true }
+  end
+
+    it "should add the given path to file as a comment" do
+      files = ["spec/assets/file-1.rb", "spec/assets/file-2.rb"]
+      from_clipboard = Code2rubylearning.start files, @options
+      from_clipboard.must_include "#filename: " + files[0]
+      from_clipboard.must_include "#filename: " + files[1]
+    end
+
+    it "should keep the first line of bin files containing #!" do
+      files = ["spec/assets/file-3.rb"]
+      from_clipboard = Code2rubylearning.start files, @options
+      from_clipboard.must_include "#filename: " + files[0]
+      second_line = from_clipboard.split("\n")[1]
+      second_line.must_include "#!"
+    end
+  end
+
+  describe "filename option false" do
+
+    before :each do
+        @options = { :filenames => false }
+    end
+
+    it "should not output the path to filename in the file" do
+      files = ["spec/assets/file-1.rb", "spec/assets/file-2.rb"]
+      from_clipboard = Code2rubylearning.start files, @options
+      from_clipboard.wont_include "#filename: " + files[0]
+      from_clipboard.wont_include "#filename: " + files[1]
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code2rubylearning
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -52,6 +52,7 @@ files:
 - lib/code2rubylearning/version.rb
 - spec/assets/file-1.rb
 - spec/assets/file-2.rb
+- spec/assets/file-3.rb
 - spec/code2rubylearning/filehandling_spec.rb
 - spec/code2rubylearning/filter_spec.rb
 - spec/code2rubylearning/version_spec.rb
@@ -69,18 +70,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -332398925
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -332398925
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -91,6 +86,7 @@ summary: command line tool that formats, given source code files, making them re
 test_files:
 - spec/assets/file-1.rb
 - spec/assets/file-2.rb
+- spec/assets/file-3.rb
 - spec/code2rubylearning/filehandling_spec.rb
 - spec/code2rubylearning/filter_spec.rb
 - spec/code2rubylearning/version_spec.rb