From 32ce66e211a408ab4271fc2647ae1dba02afeb90 Mon Sep 17 00:00:00 2001 From: Emily Bache Date: Thu, 24 May 2012 14:25:44 +0200 Subject: [PATCH] Renamed main functions to TexttestFixture to make it clear they're not part of the actual refactoring kata --- GildedRose/Java/Main.java | 35 -------------------------------- GildedRose/README | 2 +- GildedRose/python/gilded_rose.py | 26 ------------------------ GildedRose/ruby/main.rb | 33 ------------------------------ GildedRose/texttests/config.gr | 16 +++++++-------- 5 files changed, 9 insertions(+), 103 deletions(-) delete mode 100755 GildedRose/Java/Main.java delete mode 100644 GildedRose/ruby/main.rb diff --git a/GildedRose/Java/Main.java b/GildedRose/Java/Main.java deleted file mode 100755 index b227b7ed..00000000 --- a/GildedRose/Java/Main.java +++ /dev/null @@ -1,35 +0,0 @@ - -public class Main { - public static void main(String[] args) { - System.out.println("OMGHAI!"); - - Item[] items = new Item[] { new Item("+5 Dexterity Vest", 10, 20), - new Item("Aged Brie", 2, 0), - new Item("Elixir of the Mongoose", 5, 7), - new Item("Sulfuras, Hand of Ragnaros", 0, 80), - new Item("Sulfuras, Hand of Ragnaros", -1, 80), - new Item("Backstage passes to a TAFKAL80ETC concert", 15, 20), - new Item("Backstage passes to a TAFKAL80ETC concert", 10, 49), - new Item("Backstage passes to a TAFKAL80ETC concert", 5, 49), - // this conjured item does not work properly yet - new Item("Conjured Mana Cake", 3, 6) }; - - GildedRose app = new GildedRose(items); - - int days = 2; - if (args.length > 0) { - days = Integer.parseInt(args[0]) + 1; - } - - for (int i = 0; i < days; i++) { - System.out.println("-------- day " + i + " --------"); - System.out.println("name, sellIn, quality"); - for (Item item : items) { - System.out.println(item); - } - System.out.println(); - app.updateQuality(); - } - } - -} \ No newline at end of file diff --git a/GildedRose/README b/GildedRose/README index bf54061f..3ba18362 100644 --- a/GildedRose/README +++ b/GildedRose/README @@ -1,4 +1,4 @@ -This Kata was originally created by Terry Hughes (http://twitter.com/#!/TerryHughes). It is already on GitHub as "GildedRose", a sample project for C#. I could have forked it again, but I thought other language users might not want to download a whole C# project environment. In this repository are starting code samples for Java, Python, Ruby, C# and C++. +This Kata was originally created by Terry Hughes (http://twitter.com/#!/TerryHughes). It is already on GitHub as "GildedRose", a sample project for C#. I could have forked it again, but I thought other language users might not want to download a whole C# project environment. In this repository are starting code samples for Java, Python, Ruby, Smalltalk, C# and C++. See also http://iamnotmyself.com/2011/02/13/refactor-this-the-gilded-rose-kata/ diff --git a/GildedRose/python/gilded_rose.py b/GildedRose/python/gilded_rose.py index 129bad0a..334bec86 100755 --- a/GildedRose/python/gilded_rose.py +++ b/GildedRose/python/gilded_rose.py @@ -1,4 +1,3 @@ -from __future__ import print_function def update_quality(items): for item in items: @@ -40,28 +39,3 @@ class Item: def __repr__(self): return "%s, %s, %s" % (self.name, self.sell_in, self.quality) -if __name__ == "__main__": - print ("OMGHAI!") - items = [ - Item(name="+5 Dexterity Vest", sell_in=10, quality=20), - Item(name="Aged Brie", sell_in=2, quality=0), - Item(name="Elixir of the Mongoose", sell_in=5, quality=7), - Item(name="Sulfuras, Hand of Ragnaros", sell_in=0, quality=80), - Item(name="Sulfuras, Hand of Ragnaros", sell_in=-1, quality=80), - Item(name="Backstage passes to a TAFKAL80ETC concert", sell_in=15, quality=20), - Item(name="Backstage passes to a TAFKAL80ETC concert", sell_in=10, quality=49), - Item(name="Backstage passes to a TAFKAL80ETC concert", sell_in=5, quality=49), - Item(name="Conjured Mana Cake", sell_in=3, quality=6), # <-- :O - ] - - days = 2 - import sys - if len(sys.argv) > 1: - days = int(sys.argv[1]) + 1 - for day in range(days): - print("-------- day %s --------" % day) - print("name, sellIn, quality") - for item in items: - print(item) - print("") - update_quality(items) diff --git a/GildedRose/ruby/main.rb b/GildedRose/ruby/main.rb deleted file mode 100644 index a5426bbb..00000000 --- a/GildedRose/ruby/main.rb +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/ruby -w - -require File.join(File.dirname(__FILE__), 'gilded_rose') - -puts "OMGHAI!" -items = [ - Item.new(name="+5 Dexterity Vest", sell_in=10, quality=20), - Item.new(name="Aged Brie", sell_in=2, quality=0), - Item.new(name="Elixir of the Mongoose", sell_in=5, quality=7), - Item.new(name="Sulfuras, Hand of Ragnaros", sell_in=0, quality=80), - Item.new(name="Sulfuras, Hand of Ragnaros", sell_in=-1, quality=80), - Item.new(name="Backstage passes to a TAFKAL80ETC concert", sell_in=15, quality=20), - Item.new(name="Backstage passes to a TAFKAL80ETC concert", sell_in=10, quality=49), - Item.new(name="Backstage passes to a TAFKAL80ETC concert", sell_in=5, quality=49), - # This Conjured item does not work properly yet - Item.new(name="Conjured Mana Cake", sell_in=3, quality=6), # <-- :O - ] - -days = 2 -if ARGV.size > 0: - days = ARGV[0].to_i + 1 -end - -gilded_rose = GildedRose.new -(0...days).each do |day| - puts "-------- day #{day} --------" - puts "name, sellIn, quality" - items.each do |item| - puts item - end - puts "" - gilded_rose.update_quality(items) -end diff --git a/GildedRose/texttests/config.gr b/GildedRose/texttests/config.gr index a5b31f77..e7b88344 100755 --- a/GildedRose/texttests/config.gr +++ b/GildedRose/texttests/config.gr @@ -1,31 +1,31 @@ full_name:Gilded Rose Refactoring Kata # location where you have your clone -default_checkout:/home/emily/workspace/Refactoring-Katas/GildedRose +default_checkout:/Users/emily/training_materials/Refactoring-Katas/GildedRose # Settings for the Java version -#executable:Main -#interpreter:java +executable:TexttestFixture +interpreter:java # note you'll also need to update the file environment.gr with your classpath if you keep your classfiles somewhere unusual # Settings for the Python version -#executable:${TEXTTEST_CHECKOUT}/python/gilded_rose.py +#executable:${TEXTTEST_CHECKOUT}/python/texttest_fixture.py #interpreter:python # Settings for the C++ version #executable:${TEXTTEST_CHECKOUT}/cpp/GildedRoseTextTests # Settings for the Ruby version -#executable:${TEXTTEST_CHECKOUT}/ruby/main.rb +#executable:${TEXTTEST_CHECKOUT}/ruby/texttest_fixture.rb #interpreter:ruby # Settings for the C# version -executable:${TEXTTEST_CHECKOUT}/csharp/Program.exe +#executable:${TEXTTEST_CHECKOUT}/csharp/Program.exe # turn on one of these if you prefer them to notepad or emacs. [view_program] -#*:mate -*:gedit +*:mate +#*:gedit [end] filename_convention_scheme:standard