diff --git a/README.md b/README.md index dbe49072..7cf3e36f 100644 --- a/README.md +++ b/README.md @@ -11,15 +11,9 @@ This repository shares: ## Cool. How can I make my own? -Create a Google doc with the following columns: - -* **Technology** (e.g. "Hystrix") -* **Quadrant** (Needs to be exactly and at least one of each quadrants: "Platforms & Infrastructure", "Data Mgt", "Languages", "Techniques; Frameworks & Tools") -* *[optional] Comments (e.g. "lib for fault tolerance")* -* **Score** as a float between 2.0 and -2.0 (e.g. "1.8") -* *[optional] Number of votes, for internal bookkeeping* -* *[optional] Consensus score, for internal bookkeeping* -* **Skip** — set to true if entry should not be visualized on chart +* Add a new json file in the data folder +* (Best copy the most recent one) +* Add all tech stack components including quadrant and score information Then follow the instructions below. diff --git a/data/2017_02.json b/data/2017_02.json new file mode 100644 index 00000000..b30b11b0 --- /dev/null +++ b/data/2017_02.json @@ -0,0 +1,32 @@ +[ + { + "name": "PHP5.5", + "quadrant": "Languages", + "comment": "Old PHP version", + "rating": "-2" + }, + { + "name": "PHP7.1", + "quadrant": "Languages", + "comment": "New PHP version", + "rating": "1.8" + }, + { + "name": "Puppet", + "quadrant": "Platforms & Infrastructure", + "comment": "", + "rating": "-2" + }, + { + "name": "AWS S3", + "quadrant": "Data Mgt", + "comment": "", + "rating": "2" + }, + { + "name": "Symfony2", + "quadrant": "Techniques; Frameworks & Tools", + "comment": "Outdated", + "rating": "-2" + } +] diff --git a/data/2017_02.tsv b/data/2017_02.tsv deleted file mode 100644 index c3f2bd16..00000000 --- a/data/2017_02.tsv +++ /dev/null @@ -1,6 +0,0 @@ -PHP5.5 Languages -2 -PHP7 Languages 1.7 -Puppet Platforms & Infrastructure -2 -AWS S3 Data Mgt 2 -Symfony 2 Techniques; Frameworks & Tools -2 -Symfony 3.2 Techniques; Frameworks & Tools 1.7 \ No newline at end of file diff --git a/data/2017_05.json b/data/2017_05.json new file mode 100644 index 00000000..71df08cb --- /dev/null +++ b/data/2017_05.json @@ -0,0 +1,32 @@ +[ + { + "name": "PHP5.5", + "quadrant": "Languages", + "comment": "Old PHP version", + "rating": -2 + }, + { + "name": "PHP7.1", + "quadrant": "Languages", + "comment": "New PHP version", + "rating": 1.8 + }, + { + "name": "Puppet", + "quadrant": "Platforms & Infrastructure", + "comment": "", + "rating": -2 + }, + { + "name": "AWS S3", + "quadrant": "Data Mgt", + "comment": "", + "rating": 2 + }, + { + "name": "Symfony2", + "quadrant": "Techniques; Frameworks & Tools", + "comment": "Outdated", + "rating": -2 + } +] diff --git a/data/2017_05.tsv b/data/2017_05.tsv deleted file mode 100644 index 426f1ad1..00000000 --- a/data/2017_05.tsv +++ /dev/null @@ -1,6 +0,0 @@ -PHP5.5 Languages Old PHP version -2 HOLD -PHP7 Languages New PHP version 1.7 ADOPT -Puppet Platforms & Infrastructure -2 HOLD -AWS S3 Data Mgt 2 ADOPT -Symfony 2 Techniques; Frameworks & Tools -2 HOLD -Symfony 3.2 Techniques; Frameworks & Tools 1.7 ADOPT \ No newline at end of file diff --git a/radar_data.js b/radar_data.js index f65dcdcb..13c22095 100644 --- a/radar_data.js +++ b/radar_data.js @@ -44,20 +44,12 @@ var radar_data = [ "color" : "#8FA227", "items" : [ { - "name": "Symfony 3.2", + "name": "Symfony2", "pc": { - "r": 58, - "t": 152 + "r": 326, + "t": 142 }, - "movement": "t" - }, - { - "name": "Symfony 2", - "pc": { - "r": 350, - "t": 94 - }, - "movement": "t" + "movement": "c" } ] }, @@ -70,10 +62,10 @@ var radar_data = [ { "name": "AWS S3", "pc": { - "r": 97, - "t": 10 + "r": 120, + "t": 23 }, - "movement": "t" + "movement": "c" } ] }, @@ -86,10 +78,10 @@ var radar_data = [ { "name": "Puppet", "pc": { - "r": 351, - "t": 184 + "r": 382, + "t": 240 }, - "movement": "t" + "movement": "c" } ] }, @@ -100,20 +92,20 @@ var radar_data = [ "top" : (h/2 + 38), "items" : [ { - "name": "PHP7", + "name": "PHP7.1", "pc": { - "r": 113, - "t": 345 + "r": 104, + "t": 280 }, - "movement": "t" + "movement": "c" }, { "name": "PHP5.5", "pc": { - "r": 368, - "t": 354 + "r": 334, + "t": 298 }, - "movement": "t" + "movement": "c" } ] } diff --git a/transform.rb b/transform.rb index 34270437..ef6efeb1 100755 --- a/transform.rb +++ b/transform.rb @@ -137,12 +137,13 @@ def render # parse tab-separated data (exported from google doc) def self.parse(path) blips = {} - open(path).each do |line| - cols = line.split("\t") - name, quadrant, score, skip = cols[0], cols[1], cols[3], cols[6] + file = File.read(path) + JSON.parse(file).each do |row| + name, quadrant, score, skip = row["name"], row["quadrant"], row["rating"], row["skip"] + raise "PLEASE DELETE HEADER LINE: #{path}" if score == "AVG" next if skip == "TRUE" - next if score.nil? || score.strip.empty? + next if score.nil? blip = Blip.new(name, quadrant, score.to_f) blips[blip.name] = blip end @@ -150,7 +151,7 @@ def self.parse(path) end end -files = Dir["data/*.tsv"] +files = Dir["data/*.json"] radar = Radar.new(files.pop) previous = files.pop radar.track_moves(Radar.new(previous)) if previous