huge project cleanup

VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

dev/user.clj

@@ -1,7 +1,7 @@
 (ns user
   (:require [clojure.tools.namespace.repl :refer [refresh]]
-            [hsm.server :refer [start]]
-            [stuartsierra.component :as component]
+            [hsm.server :refer [startup]]
+            [com.stuartsierra.component :as component]
             ))
 
 

project.clj

@@ -7,47 +7,50 @@
 
   :source-paths ["src/clj" "src/cljs"]
   :lein-release {:deploy-via :clojars :scm :git}
-  :dependencies [[org.clojure/clojure "1.6.0"]
-                [org.clojure/core.memoize "0.5.6"]
-                [org.clojure/core.async "0.1.346.0-17112a-alpha"]
-                [ring "1.3.2"]
-                [ring/ring-codec "1.0.0" :exclusions [commons-codec]]
-                [compojure "1.3.1"]
+  :dependencies [[org.clojure/clojure "1.8.0"]
+                [org.clojure/core.memoize "0.5.9"]
+                [org.clojure/core.async "0.2.385"]
+                [ring "1.5.0"]
+                ; [ring/ring-codec "1.0.0" :exclusions [commons-codec]]
+                [http-kit "2.2.0"]
+                [compojure "1.5.1"]
                 [enlive "1.1.5"]
-                [clj-http "1.0.1"]
-                [clj-time "0.8.0"]
+                [clj-http "3.2.0"]
+                [clj-time "0.12.0"]
                 ; [figwheel "0.1.4-SNAPSHOT"]
-                [environ "1.0.0"]
-                [com.cognitect/transit-clj "0.8.259"]
+                [environ "1.1.0"]
+                [com.cognitect/transit-clj "0.8.288"]
                 [cheshire "5.3.1"]
                 [com.google.guava/guava "19.0"]
                 ; [clojurewerkz/cassaforte "2.0.0"]
-                [com.taoensso/carmine "2.9.0"]
-                [net.jpountz.lz4/lz4  "1.2.0"]
+                [com.taoensso/carmine "2.14.0"]
+
+                [net.jpountz.lz4/lz4  "1.3.0"]
                 [prismatic/schema "0.3.3"]
                 [prismatic/plumbing "0.3.5"]
-                [tentacles "0.2.5"]
-                [com.stuartsierra/component "0.2.2"]
+                ; [tentacles "0.2.5"]
+
+                [com.stuartsierra/component "0.3.1"]
+
                 [com.brainbot/iniconfig "0.2.0"]
                 [com.draines/postal "1.11.1"]
 
                 [com.climate/claypoole "0.2.1"] ; handle threads
                 [me.raynes/fs "1.4.6"]
                 [hiccup "1.0.5"]
-                ; [clojurewerkz/elastisch "2.1.0"]
-                [liberator "0.12.2"]
-                [commons-logging "1.1.3"]
-                [raven-clj "1.2.0"]
+
+                ; [raven-clj "1.4.1" :exclusions [clj-http]]
+                [com.taoensso/timbre "4.7.4"]
                 ; [twitter-api "0.7.7"]
                 [metrics-clojure "2.4.0"]
-                [slingshot "0.12.1"]
+                [slingshot "0.12.2"]
                 ; [twitter-streaming-client/twitter-streaming-client "0.3.2"]
-                [ch.qos.logback/logback-classic "1.1.2"]
-                [org.clojure/tools.logging "0.3.1"]
+                ; [ch.qos.logback/logback-classic "1.1.2"]
+                ; [org.clojure/tools.logging "0.3.1"]
                 ; [weasel "0.4.0-SNAPSHOT"]
-                [midje "1.6.3"]
+                [midje "1.8.3"]
                 [digest "1.4.4"]
-                [raven-clj "1.2.0"]
+
                 [markdown-clj "0.9.62"]
 
 
@@ -60,23 +63,23 @@
 
   ; :java-agents [[com.newrelic.agent.java/newrelic-agent "2.19.0"]]
   :plugins [[lein-environ "1.0.0"]
-            [lein-release "1.0.5"]
+            ; [lein-release "1.0.5"]
             [s3-wagon-private "1.1.2"]]
-  :repositories [["private" {:url "s3p://hackersome/releases/" :creds :gpg}]]
+
+  ; :repositories [["private" {:url "s3p://hackersome/releases/" :creds :gpg}]]
 
   :codox {:defaults {:doc/format :markdown}
           :src-dir-uri "http://github.com/bcambel/hackersome/blob/development/"
           :src-linenum-anchor-prefix "L"}
   ; :min-lein-version "2.5.0"
 
-  ; :main hsm.server
+  :main hsm.server
   :jvm-opts ["-XX:+CMSClassUnloadingEnabled"]
   :profiles {
-              :1.7 {:dependencies [[org.clojure/clojure "1.7.0-alpha4"]]}
-              :master {:dependencies [[org.clojure/clojure "1.7.0-master-SNAPSHOT"]]}
+              :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}
+              :master {:dependencies [[org.clojure/clojure "1.8.0"]]}
               ; :twitter { :main hsm.integration.twttr :uberjar-name "hsm-twitter-pipe.jar"}
               :gsync { :main hsm.gsync :uberjar-name "hsm.github.sync.jar"}
-              :tasksdb { :main hsm.tasks.db :uberjar-name "hsm.tasks.db.jar"}
               :main {:main hsm.server :uberjar-name ~(str "hsm-"VERSION".jar")}
               :dbsync {:main hsm.tasks.dbexport :uberjar-name "hsm.db.export.jar"}
               :dev {

src/clj/hsm/actions.clj

@@ -1,7 +1,7 @@
   (ns hsm.actions
   (:require
     [clojure.core.memoize :as memo]
-    [clojure.tools.logging :as log]
+    [taoensso.timbre :as log]
     [clojure.string :as str]
     [schema.core :as s]
     [clojure.java.jdbc :as jdbc]

src/clj/hsm/conf.clj

@@ -1,6 +1,6 @@
 (ns hsm.conf
   (:require
-    [clojure.tools.logging :as log]
+    [taoensso.timbre :as log]
     [com.brainbot.iniconfig :as iniconfig]
     [me.raynes.fs :refer [exists?]]))
 

src/clj/hsm/controllers/main.clj

@@ -1,6 +1,6 @@
 (ns hsm.controllers.main
   (:require
-    [clojure.tools.logging        :as log]
+    [taoensso.timbre        :as log]
     [clojure.string :as str]
     [hiccup.def                   :refer [defhtml]]
     [markdown.core :refer [md-to-html-string]]
@@ -12,7 +12,7 @@
     [hsm.views                    :refer :all]
     [hsm.utils                    :refer [host-of id-of cutoff pl->lang common-of]]
     [hsm.conf                     :refer [languages]]
-    ; [hsm.actions                  :refer [top-projects-es]]
+    [hsm.actions                  :refer [list-top-proj]]
     ))
 
 (defn homepage
@@ -67,7 +67,7 @@
   (let [host (host-of request)
         pl   (pl->lang (id-of request :platform))
         top-members []
-        top-projects [] ; (top-projects-es else pl 100)
+        top-projects (list-top-proj pl 100)
         ]
     (html-resp
       (layout {:website host

src/clj/hsm/controllers/project.clj

@@ -1,6 +1,6 @@
 (ns hsm.controllers.project
   (:require
-    [clojure.tools.logging :as log]
+    [taoensso.timbre :as log]
     [clojure.core.memoize :as memo]
     [clojure.java.io :as io]
     [clojure.string :as str]
@@ -11,11 +11,6 @@
     [hiccup.page :as hic.pg]
     [hiccup.element :as hic.el]
     [hiccup.def         :refer [defhtml]]
-    ; [clojurewerkz.elastisch.rest :as esr]
-    ; [clojurewerkz.elastisch.rest.index :as esi]
-    ; [clojurewerkz.elastisch.rest.document :as esd]
-    ; [clojurewerkz.elastisch.rest.response :as esrsp]
-    ; [clojurewerkz.elastisch.query :as q]
     [hsm.actions :as actions]
     [hsm.ring :refer [json-resp html-resp redirect]]
     [hsm.views :as views :refer [layout panel panelx render-user left-menu]]
@@ -111,57 +106,10 @@
     (-> data
       (assoc :owner (first (vec (.split (:full_name data) "/")))))))
 
-; (defn update-search
-;   "Refactor later to remove all this bulk op"
-;   [{:keys [db event-chan redis else]} request]
-;   (let [index-name  (:index else)
-;         es-conn     (:conn else)]
-;     (if (nil? es-conn)
-;       (json-resp {:ok false :reason "Conn failure..."})
-;       (do
-;         (when (esi/exists? es-conn index-name)
-;           (esi/flush es-conn index-name :refresh true))
-;         ; (mapv #(esd/create es-conn index-name "github_project" (transform-project %))
-;         ;   (actions/load-all-projects db 200))
-;         (json-resp {:ok 1})))))
-
 (defn transform-user
   [x]
   x)
 
-; (defn update-user-search-index
-;   [{:keys [db event-chan redis else]} request]
-;   (let [index-name  (:index else)
-;         es-conn     (:conn else)]
-;     (if (nil? es-conn)
-;       (json-resp {:ok false :reason "Conn failure..."})
-;       (do
-;         ; (when (esi/exists? es-conn index-name)
-;           ; (esi/flush es-conn index-name :refresh true))
-;         (mapv #(esd/create es-conn index-name "github_user" (transform-user %))
-;           (actions/load-all-users db 200))
-;         (json-resp {:ok 1})))))
-
-; (defn search
-;   "Temporary horrible searching logic.
-;   Will be replaced with proper ElasticSearch Solution"
-;   [{:keys [db event-chan redis else]} request]
-;   (let [{:keys [host id body json? user platform req-id limit-by url hosted-pl]} (common-of request)
-;         term        (get-in request [:query-params "q"])
-;         index-name  (:index else)
-;         es-conn     (:conn else)]
-;     (log/warn "TERML:" term)
-;     (let [res (esd/search es-conn index-name "github_project"
-;
-;                 :query (q/query-string :query (codec/url-encode term)))
-;                 ; :query  (q/filtered
-;                 ;     :filter   (q/term :full_name (str/lower-case platform)))
-;
-;           n (esrsp/total-hits res)
-;           hits (esrsp/hits-from res)]
-;       (json-resp (map :_source hits)))))
-;(map #(assoc % :full_name (format "%s - %s" (:watchers %) (:full_name %)))
-
 (defhtml project-header
   [id proj admin? owner contributor-count watcher-count]
   (panel id
@@ -209,8 +157,8 @@
          admin? false
          proj (first (actions/load-project db id))
          proj-extras (actions/load-project-extras* db id)
-         watcher-count (count (:watchers proj-extras))
-         contributor-count (count (:contributors proj-extras))
+         watcher-count (try (count (:watchers proj-extras)) (catch Throwable t 0))
+         contributor-count (try  (count (:contributors proj-extras)) (catch Throwable t 0))
          owner (first (.split id "/"))
          owner-obj (actions/load-user2 db owner)]
       (if json?
@@ -308,15 +256,15 @@
         related-projects []
         admin? false]
     (let [proj (first (actions/load-project db id))]
-      (log/info "Project loaded" proj)
+      (log/info "Project loaded" (select-keys proj [:id :name :full_name]))
       (if force-sync
         (do
           (gh/enhance-proj db id 1000)
           (redirect (str "/p/" id)))
         (let [proj-extras (actions/load-project-extras* db id)
               _ (log/info "Project extras loaded" proj-extras)
-              watcher-count (count (or (:watchers proj-extras) 0))
-              contributor-count (count (:contributors proj-extras))
+              watcher-count (try (count (or (:watchers proj-extras) 0)) (catch Throwable t 0))
+              contributor-count (try (count (:contributors proj-extras)) (catch Throwable t 0))
               owner (first (.split id "/"))
               owner-obj (actions/load-user2 db owner)]
           (if json?

src/clj/hsm/controllers/user.clj

@@ -1,5 +1,5 @@
 (ns hsm.controllers.user
-  (:require [clojure.tools.logging        :as log]
+  (:require [taoensso.timbre        :as log]
             [clojure.java.io              :as io]
             [clojure.core.memoize         :as memo]
             [clojure.string               :as str]

src/clj/hsm/data.clj

@@ -1,6 +1,6 @@
 (ns hsm.data
     (:require 
-      [clojure.tools.logging :as log]
+      [taoensso.timbre :as log]
       [clj-http.client :as client]))
 
 (defn extract 

src/clj/hsm/fetcher.clj

@@ -2,7 +2,7 @@
   (:require [com.climate.claypoole :as cp]
     [cheshire.core :refer :all]
     [clj-http.client :as http]
-    [clojure.tools.logging :as log]) 
+    [taoensso.timbre :as log]) 
   (:gen-class))
 
 (defn safe-parse

src/clj/hsm/gsync.clj

@@ -1,6 +1,6 @@
 (ns hsm.gsync
   (:require 
-    [clojure.tools.logging :as log]
+    [taoensso.timbre :as log]
     [com.stuartsierra.component :as component]
     [hsm.conf :as conf]
     [hsm.system :as system]

src/clj/hsm/integration/ghub.clj

@@ -2,7 +2,7 @@
     "Fetch repository information from github"
     (:require
       [clojure.string                 :as s]
-      [clojure.tools.logging          :as log]
+      [taoensso.timbre                :as log]
       [clojure.java.jdbc              :as jdbc]
       [honeysql.core                  :as sql]
       [honeysql.helpers               :refer :all]
@@ -56,6 +56,7 @@
   (let [{:keys [header safe care conf]
          :or {header header-settings safe false
               care true conf (get-config)}} options]
+    (log/info header)
     (try+
       (client/get (format "%s&client_id=%s&client_secret=%s" url
                     (:github-client conf) (:github-secret conf))

src/clj/hsm/integration/twttr.clj

@@ -5,7 +5,7 @@
 ;    [twitter.callbacks.handlers])
 ;   (:require
 ;    [cheshire.core :refer :all]
-;    [clojure.tools.logging :as log]
+;    [taoensso.timbre :as log]
 ;    [twitter-streaming-client.core :as twt-strm-cli]
 ;    [clojure.core.async :as async :refer [go >! chan]]
 ;    [environ.core :refer [env]]

src/clj/hsm/ring.clj

@@ -1,11 +1,11 @@
 (ns hsm.ring
   (:require
-    [clojure.tools.logging  :as log]
+    [taoensso.timbre  :as log]
     [ring.util.response     :as resp]
     [cognitect.transit       :as t]
     [clojure.stacktrace     :as clj-stk]
-    [raven-clj.core               :refer  [capture]]
-    [raven-clj.ring               :refer [capture-error]]
+    ; [raven-clj.core               :refer  [capture]]
+    ; [raven-clj.ring               :refer [capture-error]]
     [cheshire.core           :refer :all]
     [digest]
     [hsm.dev :refer [is-dev?]]
@@ -44,11 +44,12 @@
         (do
           (log/error e)
 
-          (when dsn
-            (let [ft (capture-error dsn req {:message (str e "->" (.getMessage e))} e nil)]))
+          ; (when dsn
+          ;   (let [ft (capture-error dsn req {:message (str e "->" (.getMessage e))} e nil)]
+          ;   ))
                 ; (log/info "SENTRY: " (deref ft 1000 :timed-out) e)
-          (log/error "[EXCP]" (str (class e)) (clj-stk/print-cause-trace e))
-          (when is-dev? (throw e))
+          ; (log/error "[EXCP]" (str (class e)) (clj-stk/print-cause-trace e))
+          ; (when is-dev? (throw e))
         (->
          (resp/response "Sorry. An error occured.")
          (resp/status 500)))))))
@@ -101,4 +102,4 @@
         (resp/header "Content-Type" "application/transit+json")
         (resp/status (or status 200)))))
 
-(def redirect resp/redirect)
+(def redirect resp/redirect)

src/clj/hsm/schema.clj

@@ -1,6 +1,6 @@
 ; (ns hsm.schema
 ;   (:require
-;     [clojure.tools.logging :as log]
+;     [taoensso.timbre :as log]
 ;     [clojurewerkz.cassaforte.cql  :as cql]
 ;     [clojurewerkz.cassaforte.query :as cq]
 ;     [qbits.hayt.dsl.statement :as hs]))

src/clj/hsm/server.clj

@@ -1,6 +1,6 @@
 (ns hsm.server
   (:require
-            [clojure.tools.logging :as log]
+            [taoensso.timbre :as log]
             [hsm.conf :as conf]
             [hsm.system :as system]
             [com.stuartsierra.component :as component]