cuki 0.0.3 → 0.0.4

data/Gemfile

@@ -9,3 +9,8 @@ group :development do
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
 end
+
+group :test do
+  gem "rspec"
+  gem "cucumber"
+end

data/Gemfile.lock

@@ -1,24 +1,46 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    builder (3.0.0)
+    cucumber (1.1.0)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.5.0)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.6)
+    diff-lcs (1.1.3)
+    gherkin (2.5.1)
+      json (>= 1.4.6)
     git (1.2.5)
     httpclient (2.2.1)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    json (1.6.1)
     nokogiri (1.5.0)
     rake (0.9.2)
     rcov (0.9.11)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
     shoulda (2.11.3)
+    term-ansicolor (1.0.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.0.0)
+  cucumber
   httpclient
   jeweler (~> 1.6.4)
   nokogiri
   rcov
+  rspec
   shoulda

data/README.rdoc

@@ -27,11 +27,11 @@ Cuki expects a configuration file in config/cuki.yml. See the sample provided.
     
 Run it from the command line:
 
-    bundle exec cuki
+    bundle exec cuki pull
 
-or, if using Bundler binstubs:
+or, if using binstubs:
 
-    bin/cuki
+    bin/cuki pull
 
 == Options
 

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/bin/cuki

@@ -2,4 +2,4 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'cuki'
 
-Cuki.invoke
+Cuki.invoke(ARGV)

data/cuki.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cuki"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Waite"]
-  s.date = "2011-10-14"
+  s.date = "2011-10-15"
   s.description = ""
   s.email = "andy@andywaite.com"
   s.executables = ["cuki"]

data/cuki.yaml.sample

@@ -2,9 +2,10 @@
 # the mappings associate the page IDs on Confluence with local feature files
 # the .feature extension is added automatically
 ---
-base: http://mywiki/pages/editpage.action?pageId=
+host: http://mywiki
 tags:
   draft: "{info:title=Draft version}"
+  signed_off: "{info:title=Signed-off}"
 mappings:
   123: products/add_product
   124: products/remove_product

data/lib/cuki.rb

@@ -6,35 +6,43 @@ require 'CGI'
 
 class Cuki
 
-  # we're assuming that the acceptance criteria starts at this point and continues to the end of the page
-  START_INDICATOR = /\d\. \*Specification\*/
+  CONFIG_PATH = 'config/cuki.yaml'
 
-  def self.invoke
-    new
+  def self.invoke(args)
+    new(args)
   end
 
-  def initialize
-    autoformat
-    read_config
-    configure_http_client
-    @mappings.each { |key, value|  process_mapping key, value }    
-    autoformat
+  def initialize(args)
+    raise "No command given" if args.empty?
+    parse_config_file
+    command = args.first
+    if 'pull' == command
+      verify_project
+      configure_http_client
+      @config['mappings'].each { |id, filepath|  process_feature id, filepath }    
+      autoformat
+    elsif 'push' == command
+      feature_to_be_pushed = args[1] # e.g. features/products/add_product.feature
+      feature_as_in_yaml = feature_to_be_pushed.gsub('features/', '').gsub('.feature', '')
+      id = @config['mappings'].invert[feature_as_in_yaml]
+      raise "No mapping found for #{feature_as_in_yaml}" unless id
+    else
+      raise "Unknown command '#{command}"
+    end
   end
 
   private
   
-  def read_config
-    config_path = 'config/cuki.yaml'
-
-    config = YAML::load( File.open( config_path ) )
-
-    @base = config["base"]
-    raise "base not found in #{config_path}" unless @base
-
-    @mappings = config["mappings"]
-    raise "mappings not found in #{config_path}" unless @mappings
-    
-    @tag_mappings = config['tags']
+  def verify_project
+    # check features folder exists
+    raise "features folder not found" unless File.exists?('features')
+    autoformat
+  end
+  
+  def parse_config_file
+    @config = YAML::load( File.open( CONFIG_PATH ) )
+    raise "Host not found in #{CONFIG_PATH}" unless @config["host"]
+    raise "Mappings not found in #{CONFIG_PATH}" unless @config["mappings"]
   end
   
   def configure_http_client
@@ -43,76 +51,66 @@ class Cuki
     @client.ssl_config.set_client_cert_file(ENV['PEM'], ENV['PEM']) if ENV['PEM']
   end
   
-  def process_mapping(key, value)
-    wiki_link = @base + key.to_s
-
+  def process_feature(id, filepath)
+    @content = ''
+    wiki_link = @config['host'] + '/pages/editpage.action?pageId=' + id.to_s
     puts "Downloading #{wiki_link}"
-
     response = @client.get wiki_link
-
     doc = Nokogiri(response.body)
+        
+    process_tags
 
-    title = doc.css('title').text
-
-    wiki_text = CGI.unescapeHTML(doc.css('#markupTextarea').text)
-    wiki_text.gsub(' ', '')
-
-    cuke_text = ''
-
-    tags = []
-    if @tag_mappings
-      @tag_mappings.each do |tag, snippet|
-        tags << "@#{tag}" if wiki_text.include?(snippet)
-      end
-    end
-
-    cuke_text += tags.join(' ') + "\n" unless [] == tags
-
-    title = title.split(' - ').first
-
-    # assuming that title is format REF - TITLE - PROJECT NAME - WIKI NAME
-    cuke_text += "Feature: " + title + "\n\n"
-
-    cuke_text += "#{wiki_link}\n\n"
-
-    if wiki_text.match(START_INDICATOR)
-      cuke_text += wiki_text.split(START_INDICATOR).last
-    else
-      cuke_text += wiki_text.split(START_INDICATOR).last
-    end
+    @content += "Feature: " + doc.at('#content-title')[:value] + "\n\n"
+    @content += "#{wiki_link}\n\n"
+    @content += CGI.unescapeHTML(doc.css('#markupTextarea').text)
 
+    clean
+    save_file filepath
+  end
+  
+  def autoformat
+    `cucumber -a . --dry-run -P` unless ENV['SKIP_AUTOFORMAT']
+  end
+  
+  def clean
+    
+    @content.gsub('&nbsp;', '')
+    
     # remove the double pipes used for table headers in Confluence
-    cuke_text.gsub!('||', '|')
+    @content.gsub!('||', '|')
 
     # remove other noise
-    cuke_text.gsub!("\r\n", "\n")
-    cuke_text.gsub!("\\\\\n", '')
-    cuke_text.gsub!('\\', '')
+    @content.gsub!("\r\n", "\n")
+    @content.gsub!("\\\\\n", '')
+    @content.gsub!('\\', '')
 
     # remove any unwanted headers
-    cuke_text.gsub!(/h\d\. /, '')
-
-    # remove an other confluence markup
-    cuke_text.gsub!(/\{.*\}/, '')
-
-    # check features folder exists
-    raise "features folder not found" unless File.exists?('features')
-
-    file_path = "features/#{value}.feature"
-    dir_path = File.dirname(file_path)
-
-    unless File.exists?(dir_path)
-      Dir.mkdir(dir_path)
-    end
+    @content.gsub!(/h\d\. /, '')
 
-    File.open(file_path, 'w') do |f|
-      puts "Writing #{file_path}"
-      f.puts cuke_text
+    # remove any other confluence markup
+    @content.gsub!(/\{.*\}/, '')
+  end
+  
+  def process_tags
+    tags = []
+    if @config['tags']
+      @config['tags'].each do |tag, snippet|
+        tags << "@#{tag}" if @content.include?(snippet)
+      end
     end
+    @content += tags.join(' ') + "\n" unless tags.empty?
   end
   
-  def autoformat
-    `cucumber -a . --dry-run -P` unless ENV['SKIP_AUTOFORMAT']
+  def save_file(filepath)
+    full_filepath = "features/#{filepath}.feature"
+    dir_path = File.dirname(full_filepath)
+
+    Dir.mkdir(dir_path) unless File.exists?(dir_path)      
+
+    File.open(full_filepath, 'w') do |f|
+      puts "Writing #{full_filepath}"
+      f.puts @content
+    end
   end
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cuki
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Andy Waite
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-14 00:00:00 Z
+date: 2011-10-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement