houston-core 0.6.3 → 0.7.0.beta

data/db/migrate/20160625230420_move_users_unfuddle_id_to_props.rb

@@ -0,0 +1,14 @@
+class MoveUsersUnfuddleIdToProps < ActiveRecord::Migration
+  def up
+    require "progressbar"
+    users = User.all
+    pbar = ProgressBar.new("users", users.count)
+    users.find_each do |user|
+      if unfuddle_id = user.read_attribute(:unfuddle_id)
+        user.update_prop! "unfuddle.id", unfuddle_id
+      end
+      pbar.inc
+    end
+    pbar.finish
+  end
+end

data/db/structure.sql

@@ -54,6 +54,44 @@ SET default_tablespace = '';
 
 SET default_with_oids = false;
 
+--
+-- Name: authorizations; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE authorizations (
+    id integer NOT NULL,
+    name character varying NOT NULL,
+    provider_id integer,
+    scope character varying,
+    access_token character varying,
+    refresh_token character varying,
+    secret character varying,
+    expires_in integer,
+    expires_at timestamp without time zone,
+    created_at timestamp without time zone,
+    updated_at timestamp without time zone
+);
+
+
+--
+-- Name: authorizations_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE authorizations_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: authorizations_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE authorizations_id_seq OWNED BY authorizations.id;
+
+
 --
 -- Name: commits; Type: TABLE; Schema: public; Owner: -; Tablespace: 
 --
@@ -222,6 +260,72 @@ CREATE SEQUENCE deploys_id_seq
 ALTER SEQUENCE deploys_id_seq OWNED BY deploys.id;
 
 
+--
+-- Name: errors; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE errors (
+    id integer NOT NULL,
+    sha character varying NOT NULL,
+    message text NOT NULL,
+    backtrace text NOT NULL,
+    created_at timestamp without time zone,
+    updated_at timestamp without time zone
+);
+
+
+--
+-- Name: errors_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE errors_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: errors_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE errors_id_seq OWNED BY errors.id;
+
+
+--
+-- Name: jobs; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE jobs (
+    id integer NOT NULL,
+    name character varying NOT NULL,
+    started_at timestamp without time zone NOT NULL,
+    finished_at timestamp without time zone,
+    succeeded boolean,
+    error_id integer
+);
+
+
+--
+-- Name: jobs_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE jobs_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: jobs_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE jobs_id_seq OWNED BY jobs.id;
+
+
 --
 -- Name: measurements; Type: TABLE; Schema: public; Owner: -; Tablespace: 
 --
@@ -294,6 +398,42 @@ CREATE SEQUENCE milestones_id_seq
 ALTER SEQUENCE milestones_id_seq OWNED BY milestones.id;
 
 
+--
+-- Name: oauth_providers; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE oauth_providers (
+    id integer NOT NULL,
+    name character varying NOT NULL,
+    site character varying NOT NULL,
+    authorize_path character varying NOT NULL,
+    token_path character varying NOT NULL,
+    client_id character varying NOT NULL,
+    client_secret character varying NOT NULL,
+    created_at timestamp without time zone,
+    updated_at timestamp without time zone
+);
+
+
+--
+-- Name: oauth_providers_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE oauth_providers_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: oauth_providers_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE oauth_providers_id_seq OWNED BY oauth_providers.id;
+
+
 --
 -- Name: project_quotas; Type: TABLE; Schema: public; Owner: -; Tablespace: 
 --
@@ -352,7 +492,8 @@ CREATE TABLE projects (
     view_options hstore DEFAULT ''::hstore NOT NULL,
     feature_states hstore DEFAULT ''::hstore NOT NULL,
     selected_features text[],
-    head_sha character varying(255)
+    head_sha character varying(255),
+    props jsonb DEFAULT '{}'::jsonb
 );
 
 
@@ -397,7 +538,9 @@ CREATE TABLE pull_requests (
     avatar_url character varying(255),
     json_labels jsonb DEFAULT '[]'::jsonb,
     created_at timestamp without time zone,
-    updated_at timestamp without time zone
+    updated_at timestamp without time zone,
+    closed_at timestamp without time zone,
+    merged_at timestamp without time zone
 );
 
 
@@ -959,7 +1102,7 @@ CREATE TABLE users (
     last_sign_in_ip character varying(255),
     created_at timestamp without time zone,
     updated_at timestamp without time zone,
-    invitation_token character varying(60),
+    invitation_token character varying,
     invitation_sent_at timestamp without time zone,
     invitation_accepted_at timestamp without time zone,
     invitation_limit integer,
@@ -978,7 +1121,8 @@ CREATE TABLE users (
     current_project_id integer,
     nickname character varying(255),
     username character varying(255),
-    environments_subscribed_to text[] DEFAULT '{}'::text[] NOT NULL
+    environments_subscribed_to text[] DEFAULT '{}'::text[] NOT NULL,
+    props jsonb DEFAULT '{}'::jsonb
 );
 
 
@@ -1071,6 +1215,13 @@ CREATE SEQUENCE versions_id_seq
 ALTER SEQUENCE versions_id_seq OWNED BY versions.id;
 
 
+--
+-- Name: id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY authorizations ALTER COLUMN id SET DEFAULT nextval('authorizations_id_seq'::regclass);
+
+
 --
 -- Name: id; Type: DEFAULT; Schema: public; Owner: -
 --
@@ -1092,6 +1243,20 @@ ALTER TABLE ONLY consumer_tokens ALTER COLUMN id SET DEFAULT nextval('consumer_t
 ALTER TABLE ONLY deploys ALTER COLUMN id SET DEFAULT nextval('deploys_id_seq'::regclass);
 
 
+--
+-- Name: id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY errors ALTER COLUMN id SET DEFAULT nextval('errors_id_seq'::regclass);
+
+
+--
+-- Name: id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY jobs ALTER COLUMN id SET DEFAULT nextval('jobs_id_seq'::regclass);
+
+
 --
 -- Name: id; Type: DEFAULT; Schema: public; Owner: -
 --
@@ -1106,6 +1271,13 @@ ALTER TABLE ONLY measurements ALTER COLUMN id SET DEFAULT nextval('measurements_
 ALTER TABLE ONLY milestones ALTER COLUMN id SET DEFAULT nextval('milestones_id_seq'::regclass);
 
 
+--
+-- Name: id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY oauth_providers ALTER COLUMN id SET DEFAULT nextval('oauth_providers_id_seq'::regclass);
+
+
 --
 -- Name: id; Type: DEFAULT; Schema: public; Owner: -
 --
@@ -1239,6 +1411,14 @@ ALTER TABLE ONLY value_statements ALTER COLUMN id SET DEFAULT nextval('value_sta
 ALTER TABLE ONLY versions ALTER COLUMN id SET DEFAULT nextval('versions_id_seq'::regclass);
 
 
+--
+-- Name: authorizations_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
+--
+
+ALTER TABLE ONLY authorizations
+    ADD CONSTRAINT authorizations_pkey PRIMARY KEY (id);
+
+
 --
 -- Name: commits_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
 --
@@ -1263,6 +1443,22 @@ ALTER TABLE ONLY deploys
     ADD CONSTRAINT deploys_pkey PRIMARY KEY (id);
 
 
+--
+-- Name: errors_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
+--
+
+ALTER TABLE ONLY errors
+    ADD CONSTRAINT errors_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: jobs_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
+--
+
+ALTER TABLE ONLY jobs
+    ADD CONSTRAINT jobs_pkey PRIMARY KEY (id);
+
+
 --
 -- Name: measurements_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
 --
@@ -1279,6 +1475,14 @@ ALTER TABLE ONLY milestones
     ADD CONSTRAINT milestones_pkey PRIMARY KEY (id);
 
 
+--
+-- Name: oauth_providers_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
+--
+
+ALTER TABLE ONLY oauth_providers
+    ADD CONSTRAINT oauth_providers_pkey PRIMARY KEY (id);
+
+
 --
 -- Name: project_quotas_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
 --
@@ -1524,6 +1728,20 @@ CREATE INDEX index_deploys_on_environment_name ON deploys USING btree (environme
 CREATE INDEX index_deploys_on_project_id_and_environment_name ON deploys USING btree (project_id, environment_name);
 
 
+--
+-- Name: index_errors_on_sha; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE UNIQUE INDEX index_errors_on_sha ON errors USING btree (sha);
+
+
+--
+-- Name: index_jobs_on_name; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX index_jobs_on_name ON jobs USING btree (name);
+
+
 --
 -- Name: index_measurements_on_name; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
@@ -1587,6 +1805,13 @@ CREATE INDEX index_project_quotas_on_week ON project_quotas USING btree (week);
 CREATE UNIQUE INDEX index_projects_on_slug ON projects USING btree (slug);
 
 
+--
+-- Name: index_pull_requests_on_closed_at; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX index_pull_requests_on_closed_at ON pull_requests USING btree (closed_at);
+
+
 --
 -- Name: index_pull_requests_on_project_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
@@ -2267,3 +2492,21 @@ INSERT INTO schema_migrations (version) VALUES ('20151228183704');
 
 INSERT INTO schema_migrations (version) VALUES ('20160120145757');
 
+INSERT INTO schema_migrations (version) VALUES ('20160317140151');
+
+INSERT INTO schema_migrations (version) VALUES ('20160419230411');
+
+INSERT INTO schema_migrations (version) VALUES ('20160420000616');
+
+INSERT INTO schema_migrations (version) VALUES ('20160507135209');
+
+INSERT INTO schema_migrations (version) VALUES ('20160507135846');
+
+INSERT INTO schema_migrations (version) VALUES ('20160510233329');
+
+INSERT INTO schema_migrations (version) VALUES ('20160625203412');
+
+INSERT INTO schema_migrations (version) VALUES ('20160625221840');
+
+INSERT INTO schema_migrations (version) VALUES ('20160625230420');
+

data/{houston.gemspec → houston-core.gemspec}

@@ -21,13 +21,12 @@ Gem::Specification.new do |spec|
 
   # For Houston as a Web Application
   spec.add_dependency "rails", "~> 4.2.5.1"
-  spec.add_dependency "sprockets", "~> 2.8" # update this when updating Rails
   spec.add_dependency "pg", "~> 0.18.3"
   # --------------------------------
   spec.add_dependency "activerecord-import"
   spec.add_dependency "activerecord-pluck_in_batches"
-  spec.add_dependency "addressable"
-  spec.add_dependency "browser"
+  spec.add_dependency "addressable", "~> 2.3.8"
+  spec.add_dependency "browser", "~> 1.1.0"
   spec.add_dependency "cancan", "~> 1.6.10"
   spec.add_dependency "default_value_for", "3.0.1"
   spec.add_dependency "devise", "~> 3.5.0"
@@ -37,11 +36,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "faraday-http-cache", "~> 1.2.2"
   spec.add_dependency "faraday-raise-errors", "~> 0.2.0"
   spec.add_dependency "gemoji", "~> 2.1.0"
-  spec.add_dependency "handlebars_assets", "~> 0.21.0" 
+  spec.add_dependency "handlebars_assets", "~> 0.23.0"
   spec.add_dependency "hpricot", "~> 0.8.6"
   spec.add_dependency "neat-rails"
   spec.add_dependency "nokogiri"
-  spec.add_dependency "houston-oauth-plugin"
+  spec.add_dependency "oauth2"
   spec.add_dependency "oj", "~> 2.13"
   spec.add_dependency "openxml-xlsx", ">= 0.2.0"
   spec.add_dependency "pg_search", "~> 1.0.5"
@@ -60,7 +59,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "coffee-rails", "~> 4.1.0"
 
   # Houston's background jobs daemon
-  spec.add_dependency "rufus-scheduler", "~> 3.1.7"
+  spec.add_dependency "rufus-scheduler", "~> 3.2.0"
   spec.add_dependency "whenever", "0.9.2" # Houston uses just the DSL for writing cron jobs
 
   # Used to create image charts for embedding in email
@@ -83,12 +82,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "simplecov", "~> 0.9.1"
 
   # Implements Houston's VersionControl::GitAdapter
-  spec.add_dependency "rugged", "~> 0.23.3" # for speaking to Git
+  spec.add_dependency "rugged", "~> 0.24.0" # for speaking to Git
 
   # For integration with GitHub
-  spec.add_dependency "octokit", "~> 4.1.0"
+  spec.add_dependency "octokit", "~> 4.3.0"
 
-  # Implements Houston's TicketTracker::UnfuddleAdapter
+  # Implements Houston's TicketTracker::UnfuddleAdapter (TODO: extract)
   spec.add_dependency "boblail-unfuddle"
 
   # For deploying to EngineYard

data/lib/configuration.rb

@@ -46,18 +46,6 @@ module Houston
       Houston::Application.paths["log"] = root.join("log/#{Rails.env}.log")
       Houston::Application.paths["tmp"] = root.join("tmp")
       Houston::Application.paths["config/environments"] << root.join("config/environments")
-
-      # TODO: finish this
-      Rails.application.assets = Sprockets::Environment.new(root) do |env|
-        env.version = Rails.env
-
-        path = "#{Houston.root}/tmp/cache/assets/#{Rails.env}"
-        env.cache = Sprockets::Cache::FileStore.new(path)
-
-        env.context_class.class_eval do
-          include ::Sprockets::Rails::Helper
-        end
-      end
     end
 
     def title(*args)
@@ -625,46 +613,30 @@ module Houston
 
   class Jobs
 
-    def run_async(slug)
-      block = find_timer_block!(slug)
-      Thread.new do
-        run! "#{slug}/manual", block
+    def run(job)
+      trigger = "manual"
+      job, trigger = [job.tags.first, job.original] if job.is_a? Rufus::Scheduler::Job
+      block = find_timer_block!(job)
+      Houston.async do
+        run! job, trigger, block
       end
     end
 
-    def run_job(job)
-      slug = job.tags.first
-      block = find_timer_block!(slug)
-      run! "#{slug}/#{job.original}", block
-    end
-
   private
 
-    def find_timer_block!(slug)
-      timer = Houston.config.timers.detect { |(_, _, name, _, _)| name == slug }
-      raise ArgumentError, "#{slug} is not a job" unless timer
+    def find_timer_block!(job_name)
+      timer = Houston.config.timers.detect { |(_, _, name, _, _)| name == job_name }
+      raise ArgumentError, "#{job_name} is not a job" unless timer
       timer.last
     end
 
-    def run!(tag, block)
-      Rails.logger.info "\e[34m[#{tag}] Running job\e[0m"
-      block.call
-
-    rescue SocketError,
-           Errno::ECONNREFUSED,
-           Errno::ETIMEDOUT,
-           Faraday::Error::ConnectionFailed,
-           Faraday::HTTP::ServerError,
-           Rugged::NetworkError,
-           Unfuddle::ConnectionError,
-           Octokit::BadGateway,
-           exceptions_wrapping(PG::ConnectionBad)
-      Rails.logger.error "\e[31m[#{tag}] #{$!.class}: #{$!.message} [ignored]\e[0m"
+    def run!(job_name, trigger, block)
+      Job.record job_name do
+        Rails.logger.info "\e[34m[#{job_name}/#{trigger}] Running job\e[0m"
+        block.call
+      end
     rescue Exception # rescues StandardError by default; but we want to rescue and report all errors
-      Rails.logger.error "\e[31m[#{tag}] \e[1m#{$!.message}\e[0m"
-      Houston.report_exception($!, parameters: {job_name: tag}) # <-- no job id!
-    ensure
-      ActiveRecord::Base.clear_active_connections!
+      Houston.report_exception($!, parameters: {job_name: job_name})
     end
 
   end