From 2d034c0643db8cf79dacce5d2c672fb6aec00cb4 Mon Sep 17 00:00:00 2001 From: Rick Salevsky Date: Mon, 17 Aug 2015 14:50:18 +0200 Subject: [PATCH] Moved conflicting and removed obsolete files for glance barclamp --- .gitignore | 8 --- .travis.yml | 19 ------ Gemfile | 35 ----------- README.md => README.glance.md | 0 Rakefile | 112 ---------------------------------- crowbar.yml => glance.yml | 0 spec/spec_helper.rb | 45 -------------- 7 files changed, 219 deletions(-) delete mode 100644 .gitignore delete mode 100644 .travis.yml delete mode 100644 Gemfile rename README.md => README.glance.md (100%) delete mode 100644 Rakefile rename crowbar.yml => glance.yml (100%) delete mode 100644 spec/spec_helper.rb diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 082f0bddfc..0000000000 --- a/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -.DS_Store -*~ - -.coverage/ -rubydeps.* - -Gemfile.lock -crowbar_framework/public/ diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 7e47c1ec13..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,19 +0,0 @@ -language: ruby -rvm: - - 2.1.0 - -branches: - except: - - old-master - - release/betty/master - - release/elefante/master - - release/essex-hack/master - - release/fledermaus/master - - release/fred/master - - release/hydrogen/master - - release/pebbles/master - - release/roxy/master - - /^release\/.*\/master-bootstrap-ui$/ - - /^release\/hadoop-.*$/ - - /^release\/mesa-.*$/ - - /^release\/suse-cloud\/.*$/ diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 5675e57a7e..0000000000 --- a/Gemfile +++ /dev/null @@ -1,35 +0,0 @@ -# -# Copyright 2011-2013, Dell -# Copyright 2013-2014, SUSE LINUX Products GmbH -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -source 'https://rubygems.org' - -group :development do - gem 'closure-compiler', '~> 1.1.10' - gem 'sass', '~> 3.2.19' - gem 'sprockets-standalone', '~> 1.2.1' - gem 'sprockets', '~> 2.11.0' - gem 'rspec', '~> 3.1.0' -end - -group :test do - gem 'simplecov', require: false - - if ENV['CODECLIMATE_REPO_TOKEN'] - gem 'coveralls', require: false - gem 'codeclimate-test-reporter', require: false - end -end diff --git a/README.md b/README.glance.md similarity index 100% rename from README.md rename to README.glance.md diff --git a/Rakefile b/Rakefile deleted file mode 100644 index c270661ace..0000000000 --- a/Rakefile +++ /dev/null @@ -1,112 +0,0 @@ -# -# Copyright 2011-2013, Dell -# Copyright 2013-2014, SUSE LINUX Products GmbH -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -begin - require 'sprockets/standalone' - - Sprockets::Standalone::RakeTask.new(:assets) do |task, sprockets| - task.assets = [ - '**/application.js' - ] - - task.sources = [ - 'crowbar_framework/app/assets/javascripts' - ] - - task.output = 'crowbar_framework/public/assets' - - task.compress = true - task.digest = true - - sprockets.js_compressor = :closure - sprockets.css_compressor = :sass - end - - namespace :assets do - def available_assets - Pathname.glob( - File.expand_path( - '../crowbar_framework/public/assets/**/*', - __FILE__ - ) - ) - end - - def digested_regex - /(-{1}[a-z0-9]{32}*\.{1}){1}/ - end - - task :setup_logger do - @logger = Logger.new(STDOUT) - @logger.level = Logger::INFO - end - - task non_digested: :setup_logger do - available_assets.each do |asset| - next if asset.directory? - next unless asset.to_s =~ digested_regex - - simple = asset.dirname.join( - asset.basename.to_s.gsub(digested_regex, ".") - ) - - if simple.exist? - simple.delete - end - - @logger.info "Symlinking #{simple}" - simple.make_symlink(asset.basename) - end - end - - task clean_dangling: :setup_logger do - available_assets.each do |asset| - next if asset.directory? - next if asset.to_s =~ digested_regex - - next unless asset.symlink? - - # exist? is enough for checking the symlink target as it resolves the - # link target and checks if that really exists. The check for having a - # symlink is already done above. - unless asset.exist? - @logger.info "Removing #{asset}" - asset.delete - end - end - end - end - - Rake::Task["assets:compile"].enhance do - Rake::Task["assets:non_digested"].invoke - Rake::Task["assets:clean_dangling"].invoke - end -rescue -end - -require 'rspec/core/rake_task' -RSpec::Core::RakeTask.new(:spec) - -task :syntaxcheck do - system('for f in `find -name \*.rb`; do echo -n "Syntaxcheck $f: "; ruby -c $f || exit $? ; done') - exit $?.exitstatus -end - -task :default => [ - :spec, - :syntaxcheck -] diff --git a/crowbar.yml b/glance.yml similarity index 100% rename from crowbar.yml rename to glance.yml diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb deleted file mode 100644 index 7781332661..0000000000 --- a/spec/spec_helper.rb +++ /dev/null @@ -1,45 +0,0 @@ -# -# Copyright 2011-2013, Dell -# Copyright 2013-2014, SUSE LINUX Products GmbH -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -require "simplecov" - -if ENV["CODECLIMATE_REPO_TOKEN"] - require "coveralls" - require "codeclimate-test-reporter" - - Coveralls.wear! - CodeClimate::TestReporter.start - - SimpleCov.start do - add_filter "/spec" - - formatter SimpleCov::Formatter::MultiFormatter[ - SimpleCov::Formatter::HTMLFormatter, - CodeClimate::TestReporter::Formatter - ] - end -else - SimpleCov.start do - add_filter "/spec" - end -end - -require "rspec" - -RSpec.configure do |config| - config.mock_with :rspec -end