From 4ff94a0e3d5f2cadc5d1f5a58202276e0e32f4a3 Mon Sep 17 00:00:00 2001 From: Lakshmoji Rao Y Date: Fri, 28 Dec 2018 13:52:33 +0530 Subject: [PATCH 01/14] test commit --- spec/spec_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index c641a55..5784d2d 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,3 @@ require 'simplecov' SimpleCov.start -require_relative '/var/lib/jenkins/workspace/CI_RubyOnRails/app/controllers/string_ops' +require_relative '/var/lib/jenkins/workspace/demo-ruby-job/app/controllers/string_ops' From 556dcf47e4ad1a51d33f61e29f9d955e54b2c6d1 Mon Sep 17 00:00:00 2001 From: Lakshmoji Rao Y Date: Fri, 28 Dec 2018 14:05:06 +0530 Subject: [PATCH 02/14] test2 --- spec/spec_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 5784d2d..9b90c20 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,3 @@ require 'simplecov' SimpleCov.start -require_relative '/var/lib/jenkins/workspace/demo-ruby-job/app/controllers/string_ops' +require_relative './app/controllers/string_ops' From 66bd795de938295fb53a2fba6ed6ff0abf1c0442 Mon Sep 17 00:00:00 2001 From: Lakshmoji Rao Y Date: Fri, 28 Dec 2018 14:08:59 +0530 Subject: [PATCH 03/14] test3 --- spec/spec_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9b90c20..68a7c00 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,3 @@ require 'simplecov' SimpleCov.start -require_relative './app/controllers/string_ops' +require_relative '../app/controllers/string_ops' From c99cf6f4c3c3c7312deb7d77110f9d83b29ab648 Mon Sep 17 00:00:00 2001 From: Lakshmoji Rao Y Date: Thu, 7 Feb 2019 14:38:08 +0530 Subject: [PATCH 04/14] Jenkins integration test --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 7db80e4..ce72d97 100644 --- a/README.md +++ b/README.md @@ -22,3 +22,5 @@ Things you may want to cover: * Deployment instructions * ... + +GPullBuilder Test From a57f87c5a038bfc534042e403494324ea1bcbbf5 Mon Sep 17 00:00:00 2001 From: Lakshmoji Rao Y Date: Thu, 7 Feb 2019 14:41:03 +0530 Subject: [PATCH 05/14] new branch read me updated --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ce72d97..43471c6 100644 --- a/README.md +++ b/README.md @@ -23,4 +23,4 @@ Things you may want to cover: * ... -GPullBuilder Test +GPullBuilder Test feature/branch1 From e4d5b46b70028606b8fe9f91285404afce4c673e Mon Sep 17 00:00:00 2001 From: lakshmojirao999 Date: Fri, 8 Feb 2019 11:22:08 +0000 Subject: [PATCH 06/14] Dockerfile added --- Dockerfile | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..5d26d14 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,18 @@ + +FROM ruby:2.2.2 +RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs + +# Install RMagick +# RUN apt-get install -y libmagickwand-dev imagemagick + +# Install Nokogiri +# RUN apt-get install -y zlib1g-dev + +RUN mkdir /myapp +WORKDIR /tmp +COPY Gemfile Gemfile +COPY Gemfile.lock Gemfile.lock +RUN bundle install -j 4 + +ADD . /myapp +WORKDIR /myapp From 2cef74fd0649fcd53a4d8d131119a95d5ee2251e Mon Sep 17 00:00:00 2001 From: lakshmojirao999 Date: Fri, 8 Feb 2019 11:26:23 +0000 Subject: [PATCH 07/14] docker config file added --- database.yml | 13 +++++++++++++ docker-compose.yml | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 database.yml create mode 100644 docker-compose.yml diff --git a/database.yml b/database.yml new file mode 100644 index 0000000..9b71007 --- /dev/null +++ b/database.yml @@ -0,0 +1,13 @@ +development: &default + adapter: postgresql + encoding: unicode + database: your-project_development + pool: 5 + username: <%= ENV.fetch('DB_USERNAME', 'your-project') %> + password: <%= ENV.fetch('DB_PASSWORD', 'your-project') %> + host: <%= ENV.fetch('DB_1_PORT_5432_TCP_ADDR', 'localhost') %> + port: <%= ENV.fetch('DB_1_PORT_5432_TCP_PORT', '5432') %> + +test: &test + <<: *default + database: your-project_test diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..fa1a540 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,32 @@ +db: + image: postgres + ports: + - "5432" + +redis: + image: redis + ports: + - "6379" + +web: + build: . + command: bundle exec rails s -p 3000 -b '0.0.0.0' + volumes: + - .:/myapp + ports: + - "3000:3000" + environment: + - DB_USERNAME=postgres + - DB_PASSWORD= + links: + - db + # - redis + +# sidekiq: +# build: . +# command: bundle exec sidekiq +# links: +# - db +# - redis +# volumes: +# - .:/usr/src/service From 5628ae07e89ac497ecaa3cc57849bb64a7147017 Mon Sep 17 00:00:00 2001 From: Lakshmoji Rao Y Date: Wed, 13 Feb 2019 12:18:58 +0530 Subject: [PATCH 08/14] update ruby file version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5d26d14..e19cbed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -FROM ruby:2.2.2 +FROM ruby:2.5.1 RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs # Install RMagick From 473e7134aad32c3c68a739414cb84a0d9145ed30 Mon Sep 17 00:00:00 2001 From: Lakshmoji Rao Y Date: Wed, 13 Feb 2019 14:32:57 +0530 Subject: [PATCH 09/14] rubcop gem added --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index e19cbed..046b190 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,9 @@ RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs # Install Nokogiri # RUN apt-get install -y zlib1g-dev +ARG version=0.43.0 + +RUN gem install rubocop -v ${version} RUN mkdir /myapp WORKDIR /tmp From dce907998ad7f0078bc804cbbec3896f4d73b96e Mon Sep 17 00:00:00 2001 From: Lakshmoji Rao Y Date: Wed, 13 Feb 2019 14:37:24 +0530 Subject: [PATCH 10/14] rubocap gem removed --- Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 046b190..e19cbed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,9 +7,6 @@ RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs # Install Nokogiri # RUN apt-get install -y zlib1g-dev -ARG version=0.43.0 - -RUN gem install rubocop -v ${version} RUN mkdir /myapp WORKDIR /tmp From acb3f23dd34dd6698e15b1e31ab04317984f4fdc Mon Sep 17 00:00:00 2001 From: Lakshmoji Rao Y Date: Wed, 13 Feb 2019 14:43:16 +0530 Subject: [PATCH 11/14] gem rubocop added --- Gemfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Gemfile b/Gemfile index 12f2e88..8c7fe8a 100644 --- a/Gemfile +++ b/Gemfile @@ -36,6 +36,9 @@ gem 'jbuilder', '~> 2.5' # Use Capistrano for deployment # gem 'capistrano-rails', group: :development +# Use rubocop lint for code coverage report +gem 'rubocop', '~> 0.43.0' + # Reduces boot times through caching; required in config/boot.rb gem 'bootsnap', '>= 1.1.0', require: false From 831a7e432a119802935e44656ab4442322801c0e Mon Sep 17 00:00:00 2001 From: Lakshmoji Rao Y Date: Wed, 13 Feb 2019 14:58:08 +0530 Subject: [PATCH 12/14] ruby 2.3 added --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e19cbed..4ba5ee4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ -FROM ruby:2.5.1 +#FROM ruby:2.5.1 +FROM ruby:2.3 RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs # Install RMagick From 2ce3cb4351779bda298148ccd99cced14f8901f6 Mon Sep 17 00:00:00 2001 From: Lakshmoji Rao Y Date: Wed, 13 Feb 2019 15:00:53 +0530 Subject: [PATCH 13/14] gem file upadted with ruby version2.3.8 --- Gemfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 8c7fe8a..4be1468 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,8 @@ gem 'rspec_junit_formatter', :require => false, :group => :test gem 'simplecov', :require => false, :group => :test git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.5.1' +#ruby '2.5.1' +ruby '2.3.8' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.2.0' From 8cc38c35efef0a87f7e305c8840323fd4570c3d9 Mon Sep 17 00:00:00 2001 From: Lakshmoji Rao Y Date: Thu, 14 Feb 2019 16:52:06 +0530 Subject: [PATCH 14/14] branch3 readme updated --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 43471c6..e2a2573 100644 --- a/README.md +++ b/README.md @@ -23,4 +23,4 @@ Things you may want to cover: * ... -GPullBuilder Test feature/branch1 +GPullBuilder Test feature/branch3