cuki 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/cuki.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "cuki"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Waite"]
@@ -39,8 +39,10 @@ Gem::Specification.new do |s|
     "features/push/tables.feature",
     "features/push/tags.feature",
     "features/step_defs/pull_steps.rb",
+    "features/step_defs/push_steps.rb",
     "features/support/env.rb",
     "lib/cuki.rb",
+    "lib/pusher.rb",
     "spec/cuki_spec.rb",
     "spec/spec_helper.rb"
   ]

data/cuki.yaml.sample

@@ -1,11 +1,10 @@
 # edit this and save it as config/cuki.yaml
 # the mappings associate the page IDs on Confluence with local feature files
-# the .feature extension is added automatically
 ---
 host: http://mywiki
 tags:
   draft: "{info:title=Draft version}"
   signed_off: "{info:title=Signed-off}"
 mappings:
-  123: products/add_product
-  124: products/remove_product
+  123: features/products/add_product.feature
+  124: features/products/remove_product.feature

data/features/pull/pull.feature

@@ -21,8 +21,8 @@ Feature: Pull
       ---
       host: http://example.com
       mappings:
-        123: products/add_product
-        456: products/remove_product
+        123: features/products/add_product.feature
+        456: features/products/remove_product.feature
       """
     And a Confluence page on "example.com" with id 123:
       """
@@ -49,7 +49,7 @@ Feature: Pull
       This feature describes adding a product
 
       """
-    Then the file "features/products/remove_product.feature" should contain exactly:
+    And the file "features/products/remove_product.feature" should contain exactly:
       """
       Feature: Remove Product
 

data/features/pull/pull_single.feature

@@ -6,8 +6,8 @@ Feature: Pull single
       ---
       host: http://example.com
       mappings:
-        123: products/add_product
-        456: products/remove_product
+        123: features/products/add_product.feature
+        456: features/products/remove_product.feature
       """
     And a Confluence page on "example.com" with id 123:
       """
@@ -25,4 +25,5 @@ Feature: Pull single
       """
     When I run `cuki pull features/products/add_product.feature`
     Then a file named "features/products/add_product.feature" should exist
-    But the file "features/products/remove_product.feature" should not exist
+    But the file "features/products/remove_product.feature" should not exist
+

data/features/pull/tables.feature

@@ -2,13 +2,12 @@
 Feature: Tables
 
   Scenario: Table with more than one column
-
     Given a file named "config/cuki.yaml" with:
       """
       ---
       host: http://example.com
       mappings:
-        123: products/add_product
+        123: features/products/add_product.feature
       """
     And a Confluence page on "example.com" with id 123:
       """
@@ -38,3 +37,4 @@ Feature: Tables
       | b | 2 |
 
       """
+

data/features/pull/tags.feature

@@ -1,6 +1,6 @@
 Feature: Tags
 
-  Scenario:
+  Scenario: 
     Given a file named "config/cuki.yaml" with:
       """
       ---
@@ -9,7 +9,7 @@ Feature: Tags
         draft: "{info:title=Draft version}"
         signed_off: "{info:title=Signed-off}"
       mappings:
-        123: products/add_product
+        123: features/products/add_product.feature
       """
     And a Confluence page on "example.com" with id 123:
       """
@@ -30,3 +30,4 @@ Feature: Tags
       Scenario: Foo
 
       """
+

data/features/pull/textile.feature

@@ -6,14 +6,14 @@ Feature: Textile
       ---
       host: http://example.com
       mappings:
-        123: products/add_product
+        123: features/products/add_product.feature
       """
     And a Confluence page on "example.com" with id 123:
       """
       <input id="content-title" value="Add Product">
       <div id="markupTextarea">
       h5. Scenario: Foo
-      
+
       h6. Scenario Outline: Bar
       </div>
       """
@@ -26,7 +26,8 @@ Feature: Textile
 
 
       Scenario: Foo
-      
+
       Scenario Outline: Bar
 
       """
+

data/features/push/push.feature

@@ -1,33 +1,28 @@
-@pending
 Feature: Push
 
-  Background: 
+  @focus @pending
+  Scenario: Push a feature with no scenarios
     Given a file named "config/cuki.yaml" with:
       """
       ---
       host: http://mywiki
       mappings:
-        123: products/add_product
+        123: features/products/add_product.feature
       """
-
-  Scenario: Push a feature with no scenarios
-    Given a file named "config/cuki.yaml" with:
+    And a file named "features/products/add_product.feature" with:
       """
       Feature: Hello world & all
 
       This is my feature
       """
-    When I run `cuki push features/products/add_product.feature`
-    Then the feature should be pushed to "http://mywiki/pages/editpage.action?pageId=123"
-    And the Confluence content should be:
+    And a Confluence page exists on "mywiki" with id 123, title "Hello world & all" and content:
       """
       This is my feature
       """
-    And the Confluence title should be:
-      """
-      Hello world & all
-      """
+    When I run `cuki push features/products/add_product.feature`
+    Then the push should be successful
 
+  @pending
   Scenario: Push a feature containing a scenario
     Given a file named "config/cuki.yaml" with:
       """
@@ -46,6 +41,7 @@ Feature: Push
       Then something
       """
 
+  @pending
   Scenario: Push a feature containing a scenario outline
     
     The first row of the examples table should be a header row.
@@ -74,6 +70,7 @@ Feature: Push
 
       """
 
+  @pending
   Scenario: Push a feature containing a scenario outline with multiple example
     Pending
 

data/features/step_defs/push_steps.rb

@@ -0,0 +1,11 @@
+Then /^the feature should be pushed to "([^"]*)" with title "([^"]*)" with:$/ do |url, title, content|
+  
+  @push_stubs ||= []
+  @push_stubs << {
+    'url' => url,
+    'title' => title,
+    'content' => content
+  }
+  
+  File.open('push_stubs.json', 'w') { |f| f.write @push_stubs.to_json }
+end

data/features/support/env.rb

@@ -5,5 +5,13 @@ require 'webmock/cucumber'
 
 Before do
   @dirs = ["."]
-  FileUtils.rm_rf 'features/products'
+  cleanup
+end
+
+After do
+  cleanup
 end
+
+def cleanup
+  FileUtils.rm_rf 'features/products'
+end

data/lib/cuki.rb

@@ -3,15 +3,12 @@ require 'httpclient'
 require 'nokogiri'
 require 'yaml'
 require 'CGI'
-require 'webmock'
 require 'json'
 
-include WebMock::API
-if File.exist?('stubs.json')
-  stubs = JSON.parse(File.open('stubs.json').read)
-  stubs.each_pair do |url, body|
-    stub_request(:get, url).to_return(:status => 200, :body => body, :headers => {})
-  end
+# terrible hack
+if File.exist?('stubs.json') || File.exist?('stubs.json')
+  require 'webmock'
+  include WebMock::API
 end
 
 class Cuki
@@ -23,32 +20,26 @@ class Cuki
   end
 
   def initialize(args)
-    if args.empty?
-      puts "No action given"
-      exit(1)
-    end
-    parse_config_file
+    validate_args args
+    read_config
+    configure_http_client
+
     action = args.first
     if 'pull' == action
+      configure_pull_stubs
       verify_project
-      configure_http_client
       file = args[1]
       if file
-        puts "got file: #{file}"
-        key = file.gsub('features/', '').gsub('.feature', '')
-        puts "key: #{key}"
-        id = @config['mappings'].invert[key]
-        filepath = key
-        process_feature id, filepath
+        id = @config['mappings'].invert[file]
+        raise "could not get id for #{file}"
+        pull_feature id, file
       else
-        @config['mappings'].each { |id, filepath|  process_feature id, filepath }
+        @config['mappings'].each { |id, filepath|  pull_feature id, filepath }
       end
       #autoformat
     elsif 'push' == action
-      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
+      configure_push_stubs
+      Pusher.push file, @config
     else
       puts "Unknown action '#{action}"
       exit(1)
@@ -63,7 +54,7 @@ class Cuki
     #autoformat
   end
   
-  def parse_config_file
+  def read_config
     unless File.exist?(CONFIG_PATH)
       puts "No config file found at #{CONFIG_PATH}"
       exit(1)
@@ -79,7 +70,7 @@ class Cuki
     @client.ssl_config.set_client_cert_file(ENV['PEM'], ENV['PEM']) if ENV['PEM']
   end
   
-  def process_feature(id, filepath)
+  def pull_feature(id, filepath)
     @content = ''
     wiki_link = @config['host'] + '/pages/editpage.action?pageId=' + id.to_s
     puts "Downloading #{wiki_link}"
@@ -141,15 +132,44 @@ class Cuki
   end
   
   def save_file(filepath)
-    full_filepath = "features/#{filepath}.feature"
-    dir_path = File.dirname(full_filepath)
+    dir_path = File.dirname(filepath)
 
     Dir.mkdir(dir_path) unless File.exists?(dir_path)      
 
-    File.open(full_filepath, 'w') do |f|
-      puts "Writing #{full_filepath}"
+    File.open(filepath, 'w') do |f|
+      puts "Writing #{filepath}"
       f.puts @content
     end
   end
   
+  def configure_pull_stubs
+    if File.exist?('stubs.json')
+      stubs = JSON.parse(File.open('stubs.json').read)
+      stubs.each_pair do |url, body|
+        stub_request(:get, url).to_return(:status => 200, :body => body, :headers => {})
+      end
+      FileUtils.rm 'stubs.json'
+    end
+  end
+  
+  def configure_push_stubs
+    if File.exist?('push_stubs.json')
+      stubs = JSON.parse(File.open('push_stubs.json').read)
+      stubs.each do |a|
+        stub_request(:post, "http://mywiki/").
+                with(:body => {"title" => a['title'], "content"=> "\n\n" + a['content']},
+                     :headers => {'Content-Type'=>'application/x-www-form-urlencoded'}).
+                to_return(:status => 200, :body => "", :headers => {})
+      end
+      FileUtils.rm 'push_stubs.json'
+    end
+  end
+  
+  def validate_args args
+    if args.empty?
+      puts "No action given"
+      exit(1)
+    end
+  end
+  
 end

data/lib/pusher.rb

@@ -0,0 +1,12 @@
+class Pusher
+  
+  def self.push(feature_to_be_pushed, config)
+  
+  id = config['mappings'].invert[feature_to_be_pushed]
+  raise "No mapping found for #{feature_to_be_pushed}" unless id
+
+  content = File.open(feature_to_be_pushed).read.gsub(/Feature: .*/, '')
+  title = File.open(feature_to_be_pushed).read.match(/Feature: (.*)/)[1]
+  response = @client.post(config['host'], {:title => title, :content => content})
+  
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cuki
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Andy Waite
@@ -150,8 +150,10 @@ files:
 - features/push/tables.feature
 - features/push/tags.feature
 - features/step_defs/pull_steps.rb
+- features/step_defs/push_steps.rb
 - features/support/env.rb
 - lib/cuki.rb
+- lib/pusher.rb
 - spec/cuki_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/andyw8/cuki