qttk 0.1.0 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbc33230e89c5c92e9a6b609c0eea867988aa9b0c05a6943c5a2b0248e5bc1f5
-  data.tar.gz: 9a788b807af82292448b41513133f46895f13502b00de382087dbbc1d4492f04
+  metadata.gz: 83d48ce495443dbea802822d6f95374535e422b193f79a67661ed07db9891ac6
+  data.tar.gz: 1ac59ca9a4b4b8911f086ca756f2fb34ce689f248fbc1bcb57d35341e363b218
 SHA512:
-  metadata.gz: e1df416f2c8704ab15cdfb4f841fe63ab44bf1e3f231fec6d9e1b052d2fed8b22650205dbc54b908f5be4f03df65113df27cd41e3b2ffcfeda6ec484f2ed97ef
-  data.tar.gz: 657245b02b29fea510973e769825e8e86b9540aada9ba795771c9ac97d619bfee8ad949bf0cb717a9a5c9bb5e669545f5f818e7e619483755c83db78a16fd059
+  metadata.gz: 81dbe754233de68f446292f44a347d36d2f84d988af052d7a0d1b6d2562d6f67d91056455426b552f7f6bd7793407a36b6bd7397f00e0c9ab329e34ab4a6946a
+  data.tar.gz: ffb52959736139bca4cc9afd6ad4ce98df9c1e6562348c2006fba8e9b36809400e4148d2c6d7a1a02854cb42c3bd07607553367ac5a58b4bf1fe2fd58c84bbe6

data/Rakefile

@@ -1,17 +1,3 @@
-begin
-  require 'bundler/gem_tasks'
-rescue LoadError
-  warn 'You must `gem install bundler` and `bundle install` to run rake tasks'
-  exit(1)
-end
+require 'rubygems/tasks'
 
-require 'rake/clean'
-require 'rake/testtask'
-
-spec = Gem::Specification.load(FileList['*.gemspec'].first)
-
-task :default => [:test, :install]
-
-Rake::TestTask.new do |t|
-  t.test_files = spec.test_files
-end
+Gem::Tasks.new

data/etc/gutenprint/gp-tool.rb

@@ -2,33 +2,33 @@ require 'quadtone'
 include Quadtone
 
 module Quadtone
-  
+
   class GPTool < Tool
-    
+
     attr_accessor :printer
-    
+
     def parse_option(option, args)
       case option
       when '--printer', '-p'
         @printer = args.shift
       end
     end
-  
+
     def run(image_file)
-      image_file = Pathname.new(image_file)
-      
+      image_file = Path.new(image_file)
+
       raise "Must specify printer with --printer" unless @printer
 
       gp = Gutenprint.new(@printer)
-      
+
       gp_channels = gp.channels
 
       geometry = gp.geometry
       width = geometry[:width]
       height = geometry[:height]
 
-      ;;warn "[reading #{image_file}]"      
-      image_list = Magick::ImageList.new(image_file)
+      ;;warn "[reading #{image_file}]"
+      image_list = Magick::ImageList.new(image_file.to_s)
       # ;;warn "[rotating]"
       # ;;image_list.rotate!(90)
       # ;;warn "[scaling]"
@@ -51,6 +51,6 @@ module Quadtone
         end
       end
     end
-  
+
   end
 end

data/lib/quadtone.rb

@@ -2,7 +2,7 @@
 require 'pp'
 
 # gems
-require 'pathname3'
+require 'path'
 require 'rvg/rvg'     # loads 'rmagick'
 require 'builder'
 require 'cupsffi'
@@ -26,7 +26,6 @@ require 'quadtone/curve_set'
 require 'quadtone/descendants'
 require 'quadtone/environment'
 require 'quadtone/extensions/math'
-require 'quadtone/extensions/pathname3'
 require 'quadtone/printer'
 require 'quadtone/profile'
 require 'quadtone/quad_file'

data/lib/quadtone/cgats.rb

@@ -8,7 +8,7 @@ module Quadtone
       cgats = new
       section_index = 0
       state = :header
-      Pathname.new(file).readlines.each do |line|
+      Path.new(file).readlines.each do |line|
         line.chomp!
         line.sub!(/#.*/, '')
         line.strip!

data/lib/quadtone/curve_set.rb

@@ -62,7 +62,7 @@ module Quadtone
 
     def chart_target
       import_from_target
-      out_file = (@profile.dir_path + @type.to_s).with_extname('.html')
+      out_file = (@profile.dir_path / @type.to_s).with_extname('.html')
       out_file.open('w') { |io| io.write(to_html) }
       ;;warn "Saved chart to #{out_file.to_s.inspect}"
       system('qlmanage', '-p', out_file.to_s)

data/lib/quadtone/environment.rb

@@ -1,5 +1,5 @@
 module Quadtone
 
-  BaseDir = Pathname.new(ENV['HOME']) + '.qttk'
+  BaseDir = Path.new(ENV['HOME']) / '.qttk'
 
 end

data/lib/quadtone/printer.rb

@@ -34,7 +34,7 @@ module Quadtone
 
     def get_inks
       # FIXME: It would be nice to get this path programmatically.
-      ppd_file = Pathname.new("/etc/cups/ppd/#{@name}.ppd")
+      ppd_file = Path.new("/etc/cups/ppd/#{@name}.ppd")
       ppd_file.readlines.each do |line|
         if line =~ /^\*%Inks\s*(.*?)\s*$/
           @inks = $1.split(/,/).map(&:downcase).map(&:to_sym)

data/lib/quadtone/profile.rb

@@ -18,11 +18,11 @@ module Quadtone
     attr_accessor :linearization_curveset
     attr_accessor :test_curveset
 
-    ProfilesDir = BaseDir + 'profiles'
+    ProfilesDir = BaseDir / 'profiles'
     ProfileName = 'profile.txt'
 
     def self.profile_names
-      Pathname.glob(ProfilesDir + '*').select { |p| p.directory? && p[0] != '.' }.map(&:basename)
+      ProfilesDir.children.select { |p| p.directory? && p.basename.to_s[0] != '.' }.map(&:basename).map(&:to_s)
     end
 
     def self.load(name)
@@ -52,7 +52,7 @@ module Quadtone
 
     def load(name)
       inks_by_num = []
-      (ProfilesDir + name + ProfileName).readlines.each do |line|
+      (ProfilesDir / name / ProfileName).readlines.each do |line|
         line.chomp!
         line.sub!(/#.*/, '')
         line.strip!
@@ -130,15 +130,19 @@ module Quadtone
     end
 
     def dir_path
-      ProfilesDir + name
+      ProfilesDir / name
     end
 
     def qtr_profile_path
-      dir_path + ProfileName
+      dir_path / ProfileName
     end
 
     def quad_file_path
-      Pathname.new('/Library/Printers/QTR/quadtone') + @printer.name + "#{name}.quad"
+      Path.new('/Library/Printers/QTR/quadtone') / @printer.name / "#{name}.quad"
+    end
+
+    def html_path
+      dir_path / 'profile.html'
     end
 
     def ink_limit(ink)
@@ -148,9 +152,9 @@ module Quadtone
     def install
       # filename needs to match name of profile for quadprofile to install it properly,
       # so temporarily make a symlink
-      tmp_file = Pathname.new('/tmp') + "#{name}.txt"
-      qtr_profile_path.symlink(tmp_file)
-      system('/Library/Printers/QTR/bin/quadprofile', tmp_file)
+      tmp_file = Path.new('/tmp') / "#{name}.txt"
+      qtr_profile_path.symlink(tmp_file.to_s)
+      system('/Library/Printers/QTR/bin/quadprofile', tmp_file.to_s)
       tmp_file.unlink
     end
 

data/lib/quadtone/quad_file.rb

@@ -24,7 +24,7 @@ module Quadtone
 
     def load(quad_file)
       ;;warn "reading #{quad_file}"
-      lines = Pathname.new(quad_file).open.readlines.map { |line| line.chomp.force_encoding('ISO-8859-1') }
+      lines = Path.new(quad_file).open.readlines.map { |line| line.chomp.force_encoding('ISO-8859-1') }
       # process header
       channels = parse_channel_list(lines.shift)
       channels.each do |channel|

data/lib/quadtone/target.rb

@@ -139,7 +139,8 @@ module Quadtone
     def sample_image(size)
       ;;warn "\t" + "generating sample image of size #{size.inspect}"
       bounds = Magick::Rectangle.new(*size, 0, 0)
-      ilist = Magick::ImageList.new(Pathname.new(ENV['HOME']) + 'Desktop' + '121213b.01.tif')
+      file = Path.new(ENV['HOME']) / 'Desktop' / '121213b.01.tif'   #FIXME: parameterize
+      ilist = Magick::ImageList.new(file.to_s)
       ilist.first.resize_to_fill(*size)
     end
 
@@ -211,7 +212,7 @@ module Quadtone
     # private
 
     def base_file(channel=nil, n=nil)
-      @base_dir + (@name.to_s + (channel ? "-#{channel}" : '') + (n ? "-#{n}" : ''))
+      @base_dir / (@name.to_s + (channel ? "-#{channel}" : '') + (n ? "-#{n}" : ''))
     end
 
     def ti1_file(channel)
@@ -235,19 +236,19 @@ module Quadtone
     end
 
     def ti_files
-      Pathname.glob(base_file.with_extname('*.ti[123]'))
+      Path.glob(base_file.with_extname('*.ti[123]'))
     end
 
     def ti2_files(channel)
-      Pathname.glob(base_file(channel).with_extname('*.ti2'))
+      Path.glob(base_file(channel).with_extname('*.ti2'))
     end
 
     def ti3_files(channel)
-      Pathname.glob(base_file(channel).with_extname('*.ti3'))
+      Path.glob(base_file(channel).with_extname('*.ti3'))
     end
 
     def image_files
-      Pathname.glob(base_file.with_extname('*.tif'))
+      Path.glob(base_file.with_extname('*.tif'))
     end
 
     def cleanup_files(files)
@@ -261,7 +262,7 @@ module Quadtone
           files += image_files
         when :ti
           files += ti_files
-        when Pathname
+        when Path
           if file.exist?
             # ;;warn "\t" + file
             file.unlink

data/lib/quadtone/tools/add_printer.rb

@@ -16,19 +16,20 @@ module Quadtone
           raise ToolUsageError, "Printer #{printer.inspect} already exists"
         end
 
-        curves_dir          = Pathname.new('/Library/Printers/QTR/quadtone') + printer
-        cups_data_dir       = Pathname.new(%x{cups-config --datadir}.chomp)
-        cups_serverbin_dir  = Pathname.new(%x{cups-config --serverbin}.chomp)
+        curves_dir          = Path.new('/Library/Printers/QTR/quadtone') / printer
+        ppds_dir            = Path.new('/Library/Printers/PPDs/Contents/Resources')
+        cups_serverbin_dir  = Path.new(%x{cups-config --serverbin}.chomp)
+        cups_backend_usb_tool = cups_serverbin_dir / 'backend' / 'usb'
 
         model = printer.split(/[-_=]/).first
-        model_ppd = "C/#{model}.ppd.gz"
-        ppd_file = cups_data_dir + 'model' + model_ppd
+        model_ppd = "#{model}.ppd.gz"
+        ppd_file = ppds_dir / model_ppd
 
         raise "QuadToneRIP does not support printer model #{model.inspect}" unless ppd_file.exist?
 
         uri = loc = nil
 
-        File.popen(cups_serverbin_dir + 'backend' + 'usb').readlines.each do |line|
+        File.popen(cups_backend_usb_tool.to_s).readlines.each do |line|
           #FIXME: Too fragile -- use 'lpinfo' to find all printers
           if line =~ /(usb:.*EPSON.*#{Regexp.escape(model.sub(/^Quad/, ''))})/
             uri = $1

data/lib/quadtone/tools/edit.rb

@@ -5,12 +5,11 @@ module Quadtone
     class Edit < Tool
 
       def run
-        # editor = ENV['EDITOR'] or raise "Can't determine editor"
-        editor = 'subl'
-        Quadtone.run(editor,
+        editor = ENV['EDITOR'] or raise "Can't determine editor"
+        system(editor,
           '--wait',
-          @profile.qtr_profile_path)
-        @profile = Profile.load(@profile.qtr_profile_path)
+          @profile.qtr_profile_path.to_s)
+        @profile = Profile.load(@profile.name)
         @profile.check
         @profile.save
         @profile.show

data/lib/quadtone/tools/init.rb

@@ -20,6 +20,7 @@ module Quadtone
 
       def get_printer
         printers = CupsPrinter.get_all_printer_names.map { |n| Printer.new(n) }.select(&:quadtone?)
+        raise "No quadtone printers" if printers.empty?
         @printer = prompt('Printer', printers, printers[0]) { |p| p.name }
       end
 

data/lib/quadtone/tools/print.rb

@@ -26,7 +26,7 @@ module Quadtone
       end
 
       def run(*args)
-        args.map { |p| Pathname.new(p) }.each do |image_path|
+        args.map { |p| Path.new(p) }.each do |image_path|
           @profile.print_file(image_path, calibrate: @calibrate, printer_options: @printer_options)
         end
       end

data/lib/quadtone/tools/rename.rb

@@ -6,7 +6,7 @@ module Quadtone
 
       def run(*args)
         new_name = args.shift or raise "Must specify new name"
-        new_path = Profile::ProfilesDir + new_name
+        new_path = Profile::ProfilesDir / new_name
         @profile.dir_path.rename(new_path)
       end
 

data/lib/quadtone/tools/render.rb

@@ -30,7 +30,7 @@ module Quadtone
         options.merge!(page_size: @page_size) if @page_size
         options.merge!(desired_size: @desired_size) if @desired_size
         renderer = Renderer.new(options)
-        args.map { |p| Pathname.new(p) }.each do |input_path|
+        args.map { |p| Path.new(p) }.each do |input_path|
           output_paths = renderer.render(input_path)
           ;;warn "\t" + "Wrote rendered file to #{output_paths.join(', ')}"
         end

data/lib/quadtone/tools/separate.rb

@@ -22,12 +22,12 @@ module Quadtone
       def run(image_file=nil)
 
         if @gradient
-          image_file = Pathname.new('gradient.tif')
+          image_file = Path.new('gradient.tif')
           image = Magick::Image.new(200, 200, Magick::GradientFill.new(0, 0, 0, 200, 'white', 'black'))
         else
           raise ToolUsageError, "Must specify image file (or --gradient option)" unless image_file
-          image_file = Pathname.new(image_file)
-          image = Magick::Image.read(image_file).first
+          image_file = Path.new(image_file)
+          image = Magick::Image.read(image_file.to_s).first
         end
 
         quad = QuadFile.new(@profile)
@@ -51,7 +51,7 @@ module Quadtone
           images.each do |channel, separated_image|
             separated_image_file = image_file.with_extname(".#{@profile.name}.sep-#{channel}.tif")
             ;;warn "writing channel #{channel} of separated file to #{separated_image_file}"
-            separated_image.write(separated_image_file) { self.compression = Magick::ZipCompression }
+            separated_image.write(separated_image_file.to_s) { self.compression = Magick::ZipCompression }
           end
         end
 

data/lib/quadtone/version.rb

@@ -0,0 +1,5 @@
+module Quadtone
+
+  VERSION = '0.2'
+
+end

data/qttk.gemspec

@@ -1,12 +1,8 @@
-# -*- encoding: utf-8 -*-
-
-$LOAD_PATH << File.expand_path('../lib', __FILE__)
-
-# require 'qttk/version'
+require_relative 'lib/quadtone/version'
 
 Gem::Specification.new do |s|
   s.name        = 'qttk'
-  s.version     = '0.1.0'   # QTTK::VERSION
+  s.version     = Quadtone::VERSION
   s.author      = 'John Labovitz'
   s.email       = 'johnl@johnlabovitz.com'
   s.homepage    = 'http://github.com/jslabovitz/qttk'
@@ -14,21 +10,22 @@ Gem::Specification.new do |s|
   s.description = %q{
     Quadtone Toolkit (QTTK): Tools for working with the quadtone printing process.
   }
+  s.license       = 'MIT'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ['lib']
+  s.require_path  = 'lib'
 
-  s.add_dependency 'builder'
-  s.add_dependency 'pathname3'
-  s.add_dependency 'rmagick'
-  s.add_dependency 'ffi'
-  s.add_dependency 'cupsffi'
-  s.add_dependency 'hashstruct'
-  s.add_dependency 'descriptive_statistics'
-  s.add_dependency 'spliner'
+  s.add_dependency 'builder', '~> 3.2'
+  s.add_dependency 'path', '~> 2.0'
+  s.add_dependency 'rmagick', '~> 2.16'
+  s.add_dependency 'ffi', '~> 1.9'
+  s.add_dependency 'cupsffi', '~> 0.1'
+  s.add_dependency 'hashstruct', '~> 1.3'
+  s.add_dependency 'descriptive_statistics', '~> 2.5'
+  s.add_dependency 'spliner', '~> 1.0'
 
-  # s.add_development_dependency 'minitest'
-  # s.add_development_dependency 'wrong'
+  s.add_development_dependency 'rake', '~> 12.3'
+  s.add_development_dependency 'rubygems-tasks', '~> 0.2'
 end

metadata

@@ -1,127 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: qttk
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: '0.2'
 platform: ruby
 authors:
 - John Labovitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2018-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: pathname3
+  name: path
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.16'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: cupsffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: hashstruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: descriptive_statistics
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: spliner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
+- !ruby/object:Gem::Dependency
+  name: rubygems-tasks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: "\n    Quadtone Toolkit (QTTK): Tools for working with the quadtone printing
   process.\n  "
 email: johnl@johnlabovitz.com
@@ -131,8 +159,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- Gemfile
-- Gemfile.lock
 - README.markdown
 - Rakefile
 - TODO.markdown
@@ -160,7 +186,6 @@ files:
 - lib/quadtone/descendants.rb
 - lib/quadtone/environment.rb
 - lib/quadtone/extensions/math.rb
-- lib/quadtone/extensions/pathname3.rb
 - lib/quadtone/printer.rb
 - lib/quadtone/profile.rb
 - lib/quadtone/quad_file.rb
@@ -188,9 +213,11 @@ files:
 - lib/quadtone/tools/separate.rb
 - lib/quadtone/tools/show.rb
 - lib/quadtone/tools/test.rb
+- lib/quadtone/version.rb
 - qttk.gemspec
 homepage: http://github.com/jslabovitz/qttk
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/Gemfile

@@ -1,6 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'rake'
-
-# See .gemspec file for dependencies
-gemspec

data/Gemfile.lock

@@ -1,36 +0,0 @@
-PATH
-  remote: .
-  specs:
-    qttk (0.1.0)
-      builder
-      cupsffi
-      descriptive_statistics
-      ffi
-      hashstruct
-      pathname3
-      rmagick
-      spliner
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    builder (3.2.3)
-    cupsffi (0.1.7)
-      ffi
-    descriptive_statistics (2.5.1)
-    ffi (1.9.22)
-    hashstruct (1.3.1)
-    pathname3 (1.2.5)
-    rake (12.3.0)
-    rmagick (2.16.0)
-    spliner (1.0.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  qttk!
-  rake
-
-BUNDLED WITH
-   1.16.1

data/lib/quadtone/extensions/pathname3.rb

@@ -1,11 +0,0 @@
-class Pathname
-  
-  def with_extname(extname)
-    Pathname.new(without_extname.to_s + extname)
-  end
-  
-  def without_extname
-    Pathname.new(to_s.sub(/#{Regexp.quote(self.extname)}$/, ''))
-  end
-  
-end