interstate 0.0.2.1 → 0.0.3

data/.todo/list.yml

@@ -0,0 +1,3 @@
+--- !map:Todo::List 
+Ask Simon to have a look at why log is returning really old entries first: 
+- log

data/interstate.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency "terminal-table"
   s.add_dependency "rainbow"
   s.add_dependency "time-ago-in-words"
+  s.add_dependency "typhoeus"
     
   s.rubyforge_project = "interstate"
 

data/lib/api.rb

@@ -1,5 +1,5 @@
 require "nestful"
-require "lib/store"
+require "typhoeus"
 
 class API
 
@@ -39,4 +39,51 @@ class API
     return JSON.parse(Nestful.post url, :params => params)["response"]
   end
   
+  def self.delete_road(_id)
+    url = "https://api.interstateapp.com/v1/road/delete/id/#{_id}.json?oauth_token=#{@@token}"
+    return JSON.parse(Nestful.get url)["response"]
+  end
+  
+  def self.log(_id, appId)
+    url = "https://api.interstateapp.com/v1/activity/list/id/#{appId}/limit/10.json?oauth_token=#{@@token}"
+    return JSON.parse(Nestful.post url, :params => { "filter" => "roadmap-#{_id}" } )["response"]
+  end
+  
+  def self.updates(log) # we'll handle updates by parallel processing them with typhoeus
+    hydra = Typhoeus::Hydra.new(:max_concurrency => 50)
+    updates = []
+    log.each do |entry|
+  
+      if entry["type"] == "github"  
+        begin  
+          info = entry["comments"][0]
+          updates << { "update" => info["comment"], "time" => info["time"], "staffId" => info["staffId"], "type" => "GitHub Commit" }
+        rescue
+        end
+      elsif entry["type"] == "road_update"
+          r = Typhoeus::Request.new("https://api.interstateapp.com/v1/update/get/id/#{entry["updateId"]}.json?oauth_token=#{@@token}")
+          r.on_complete do |response|
+            update = JSON.parse(response.body)["response"]
+            if update.class != NilClass
+              update["type"] = "Road Update"
+              updates << update
+            end
+          end
+          hydra.queue r
+      
+      elsif entry["type"] == "road"        
+        r = Typhoeus::Request.new("https://api.interstateapp.com/v1/road/#{entry["roadId"]}.json?oauth_token=#{@@token}")
+        r.on_complete do |response|
+          road = JSON.parse(response.body)["response"]
+          if road.class != NilClass
+            updates << { "update" => "New Road: #{road["title"]}", "time" => entry["time"], "staffId" => entry["staffId"], "type" => "New Road" }
+          end
+        end
+        hydra.queue r
+      end
+      hydra.run
+    end
+    return updates
+  end
+  
 end

data/lib/interstate/version.rb

@@ -1,3 +1,3 @@
 module Interstate
-  VERSION = "0.0.2.1"
+  VERSION = "0.0.3"
 end

data/lib/interstate.rb

@@ -5,14 +5,14 @@ require "rainbow"
 require "nestful"
 require "pp"
 require "time-ago-in-words"
-require "lib/store"
-require "lib/api"
-require "lib/table"
+require "store"
+require "api"
+require "table"
 
 # Interstate-CLI by BakedCode
 
 class Interstate < Thor
-              
+                          
   # Load the config files etc.
   config =    Store.load_config
   @@maps =    Store.load_maps
@@ -21,25 +21,25 @@ class Interstate < Thor
   @@current_map = config["current_map"]
   
   # maps
-  desc "maps", "List roadmaps"
+  desc "maps", "Show a list of roadmaps"
   method_option :reload, :type => :boolean, :force => true, :aliases => "-r"
   def maps
     Table.maps(@@maps, @@current_map)
   end
   
-  # switch
-  desc "switch", "Switch to a different roadmap"
-  def switch(roadmapID)
+  # map
+  desc "map", "Switch to a different roadmap"
+  def map(roadmapID)
     if (@@maps[roadmapID])
       Store.set_current_map(roadmapID) 
-      puts "\nSwitch >> " + "#{@@maps[roadmapID]["title"]}\n".bright       
+      puts "\nMap >> " + "#{@@maps[roadmapID]["title"]}\n".bright       
     else
       puts "No roadmap with that shortcode".bright.color(:red)
     end
   end
   
   # roads
-  desc "roads", "List roads in roadmap"
+  desc "roads", "Show a list of roads in roadmap"
   method_option :status, :type => :boolean, :aliases => "-r", :default => false, :desc => "Displays a guide and prompts you for a new status code."
   def roads
     currentRoads = @@roads[@@current_map]
@@ -54,11 +54,11 @@ class Interstate < Thor
     Table.roads(currentRoads, currentMap["title"])
   end
   
-  # show
-  desc "show", "Show details for particular road"
-  def show(roadID)
+  # road
+  desc "road", "Show details for particular road"
+  def road(roadID)
     if @@roads[@@current_map][roadID] == nil
-      puts "\nA roadmap with that shortcode does not exist.\n".bright.color(:red)
+      puts "\nA road with that shortcode does not exist.\n".bright.color(:red)
     else
       id    = @@roads[@@current_map][roadID]["_id"]
       staff = @@staff["#{@@current_map}"] 
@@ -67,15 +67,33 @@ class Interstate < Thor
     end
   end
   
+  # delete
+  desc "delete", "Delete an existing road"
+  def delete(roadID)
+    if @@roads[@@current_map][roadID] == nil
+      puts "\nA road with that shortcode does not exist.\n".bright.color(:red)
+    else
+      id = @@roads[@@current_map][roadID]["_id"]
+      success = API.delete_road(id)["deleted"]
+      if success == true
+        roads = API.roads(@@maps[@@current_map]["_id"])
+        Store.overwrite_roads(roads, @@current_map)
+        puts "\nRoad was successfully deleted.\n".bright.color(:green)
+      else
+        puts "\nThere was a problem deleting the road.\n".bright.color(:yellow)
+      end
+    end
+  end
+  
   # add
   desc "add", "Add a new road to current roadmap"
   def add
     # Get user input
     id = @@maps[@@current_map]["_id"]
     puts "\nAdding a road to #{@@maps[@@current_map]["title"]}".bright
-    puts "Title".bright
+    puts "Title:"
     title = STDIN.gets
-    puts "Description".bright
+    puts "Description:"
     desc  = STDIN.gets
     params = { :roadmapId => "#{id}", :title => "#{title}", :description => "#{desc}" }
     
@@ -93,27 +111,57 @@ class Interstate < Thor
   
   # update
   desc "update", "Update a road"
-  method_option :message, :type => :string, :aliases => "-m", :required => true, :desc => "A required update message."
-  method_option :status, :type => :boolean, :aliases => "-s", :default => false, :desc => "Displays a guide and prompts you for a new status code."
+  method_option :message, :type => :string, :aliases => "-m", :desc => "A required update message."
+  method_option :status, :type => :string, :aliases => "-s", :default => nil, :desc => "Displays a guide and prompts you for a new status code."
   def update(roadID)
     if @@roads[@@current_map][roadID] == nil
       puts "\nA road with that shortcode does not exist.\n".bright.color(:red)
     else
       status = nil
-      if options.status == true
-        puts "\n" + "Message".bright + " #{options.message}"
+      stati = Store.statuses
+      if options.status == "status"
         Table.status
         puts "Enter a new status code and press return".bright
         status = STDIN.gets
+      elsif stati.has_value?(options.status)
+        status = stati.index(options.status)
+      elsif  stati.has_key?("#{options.status}")
+        status = "#{options.status}"
+      else
+        puts "Invalid status code.".color(:red)
+      end
+      message = nil
+      if options.message != nil
+        message = options.message
       end
       id = @@roads[@@current_map][roadID]["_id"]
-      road = API.update_road(id, options.message, status)    
+      road = API.update_road(id, message, status)    
       staff = @@staff["#{@@current_map}"]
       puts "\n#{road["title"]} was updated successfully.".bright.color(:green) 
       Table.road(road, roadID, staff)
     end
   end
   
+  # log
+  desc "log", "Show activity log"
+  def log
+    id = @@maps[@@current_map]["_id"]
+    appID = @@maps[@@current_map]["appId"]
+    log = API.log(id, appID) # get the log for current map
+    updates = API.updates(log)
+    staff = @@staff["#{@@current_map}"]
+    updates.each do |update|
+      if update != nil
+        type = update["type"]
+        staffID = update["staffId"]
+        name = staff[staffID]
+        time = Time.at(update["time"])
+        puts "\n    #{update["update"]}\n\nType: #{type}\nAuthor: #{name}\nDate: #{time}"
+      end
+    end
+    puts "\n"
+  end
+  
   # reset
   desc "reset", "Reset all config files"
   def reset

data/lib/store.rb

@@ -21,7 +21,7 @@ class Store
       apps.each_pair do |key, app|
         app.each do |roadmap|  
           shortcode = "#{Array.new(1) { (rand(122-97) + 97).chr }}#{10 + rand(89)}"
-          newData["#{shortcode}"] = {"title" => roadmap["title"], "_id" => roadmap["_id"]}
+          newData["#{shortcode}"] = { "title" => roadmap["title"], "_id" => roadmap["_id"] , "appId" => roadmap["appId"] }
         end
       end
       open('.maps', 'wb') { |f| f.puts Marshal.dump(newData) }
@@ -60,21 +60,41 @@ class Store
   end
   
   def self.overwrite_roads(roads, current_map)
-    allRoads = self.load_roads
-    roadHash = {}
+    cachedRoads = self.load_roads
+    currentRoads = cachedRoads[current_map]
+    cachedIDs = []
+    toRemove = {}
+    currentRoads.each_pair do |k, v|
+      cachedIDs << v["_id"]
+      toRemove[v["_id"]] = k
+    end
+    
     roads.each do |road|
       if road["isRoute"] 
         road["roads"].each do |subRoad|
-          shortcode = "#{Array.new(1) { (rand(122-97) + 97).chr }}#{10 + rand(89)}"
-          roadHash["#{shortcode}"] = {"title" => subRoad["title"], "_id" => subRoad["_id"], "description" => subRoad["description"], "route" => road["title"]}
+          if cachedIDs.include?(subRoad["_id"])
+            cachedIDs.delete(subRoad["_id"])
+          else
+            shortcode = "#{Array.new(1) { (rand(122-97) + 97).chr }}#{10 + rand(89)}"
+            currentRoads["#{shortcode}"] = {"title" => subRoad["title"], "_id" => subRoad["_id"], "description" => subRoad["description"], "route" => road["title"]}
+          end
         end
       else
-        shortcode = "#{Array.new(1) { (rand(122-97) + 97).chr }}#{10 + rand(89)}"
-        roadHash["#{shortcode}"] = {"title" => road["title"], "_id" => road["_id"], "description" => road["description"], "route" => ""}
+        if cachedIDs.include?(road["_id"])
+          cachedIDs.delete(road["_id"])
+        else
+          shortcode = "#{Array.new(1) { (rand(122-97) + 97).chr }}#{10 + rand(89)}"
+          currentRoads["#{shortcode}"] = {"title" => road["title"], "_id" => road["_id"], "description" => road["description"], "route" => ""}
+        end
       end
     end
-    allRoads[current_map] = roadHash
-    open('.roads', 'wb') { |f| f.puts Marshal.dump(allRoads) } 
+    
+    cachedIDs.each do |_id|
+      currentRoads.delete(toRemove[_id])
+    end
+    
+    cachedRoads[current_map] = currentRoads
+    open('.roads', 'wb') { |f| f.puts Marshal.dump(cachedRoads) } 
     return self.load_roads 
   end
   
@@ -115,4 +135,25 @@ class Store
     self.load_staff
   end
   
+  def self.statuses()
+    statuses =  { "0"  => "Stopped",
+                  "1"  => "Started",
+                  "2"  => "10%",
+                  "3"  => "20%",
+                  "4"  => "30%",
+                  "5"  => "40%",
+                  "6"  => "50%",
+                  "7"  => "60%",
+                  "8"  => "70%",
+                  "9"  => "80%",
+                  "10" => "90%",
+                  "11" => "Ready",
+                  "12" => "Launched",
+                  "13" => "Proposed",
+                  "14" => "Postponed"  }
+  end
+                  
+                  
+                  
+  
 end

metadata

@@ -1,14 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: interstate
 version: !ruby/object:Gem::Version 
-  hash: 69
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  - 1
-  version: 0.0.2.1
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Alec Sloman
@@ -16,17 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-04 00:00:00 Z
+date: 2011-06-08 00:00:00 +09:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -36,11 +33,9 @@ dependencies:
   name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -50,11 +45,9 @@ dependencies:
   name: oauth2
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -64,11 +57,9 @@ dependencies:
   name: nestful
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -78,11 +69,9 @@ dependencies:
   name: terminal-table
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -92,11 +81,9 @@ dependencies:
   name: rainbow
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -106,16 +93,26 @@ dependencies:
   name: time-ago-in-words
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: typhoeus
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id008
 description: A command line utility for Interstate, in Ruby using Thor
 email: 
 - alec@suprfrends.com
@@ -127,6 +124,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .todo/list.yml
 - Gemfile
 - Rakefile
 - bin/interstate
@@ -138,6 +136,7 @@ files:
 - lib/memfetcher.rb
 - lib/store.rb
 - lib/table.rb
+has_rdoc: true
 homepage: http://www.bakedcode.com
 licenses: []
 
@@ -147,27 +146,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: interstate
-rubygems_version: 1.8.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Interstate-CLI