less-rails-bootstrap 3.0.0.rc1 → 3.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. data/CHANGELOG.md +5 -1
  2. data/CONTRIBUTING.md +9 -0
  3. data/README.md +3 -15
  4. data/lib/less/rails/bootstrap/engine.rb +1 -1
  5. data/lib/less/rails/bootstrap/version.rb +1 -1
  6. data/scripts/update_bootstrap.sh +40 -10
  7. data/test/cases/engine_spec.rb +1 -1
  8. data/test/cases/usage_css_spec.rb +1 -1
  9. data/test/spec_helper.rb +4 -3
  10. metadata +68 -64
data/CHANGELOG.md CHANGED
@@ -1,7 +1,11 @@
1
1
  CHANGELOG
2
2
  =========
3
3
 
4
- 3.0.0 - TBA
4
+ 3.0.0.1 - 20/08/2013
5
+
6
+ * proper 3.0.0 release
7
+
8
+ 3.0.0 (yanked) - 20/08/2013
5
9
 
6
10
  * Update boostrap to 3.0.0
7
11
 
data/CONTRIBUTING.md ADDED
@@ -0,0 +1,9 @@
1
+ ## Contributing
2
+
3
+ Here are the steps to update the version of twitter bootstrap used.
4
+
5
+ * Clone this repository.
6
+ * Run the `./scripts/update_bootstrap.sh` script with bootstrap repo
7
+ version tag argument. For example `./scripts/update_bootstrap.sh v3.0.0`.
8
+ * RUN THE TESTS!
9
+ * Send pull request.
data/README.md CHANGED
@@ -1,7 +1,4 @@
1
- # Less Rails Bootstrap 3.0.0-rc1 [![Build Status](https://travis-ci.org/metaskills/less-rails-bootstrap.png?branch=3.0.0-rc1)](https://travis-ci.org/metaskills/less-rails-bootstrap)
2
-
3
- This fork is using
4
- [3.0.0-wip](https://github.com/twbs/bootstrap/tree/3.0.0-wip) [Twitter Bootstrap](https://github.com/twbs/bootstrap) branch. You can read about new bootstrap version [here](https://github.com/twitter/bootstrap/pull/6342).
1
+ # Less Rails Bootstrap 3.0.0 [![Build Status](https://travis-ci.org/metaskills/less-rails-bootstrap.png?branch=master)](https://travis-ci.org/metaskills/less-rails-bootstrap)
5
2
 
6
3
  Bootstrap is Twitter's toolkit for kickstarting your site or app's CSS. It includes base styles for typography, forms, buttons, tables, grid layout, navigation, alerts, and more. To get started -- check out the [Bootstrap docs](http://getbootstrap.com/).
7
4
 
@@ -24,7 +21,7 @@ LESS requires a JavaScript runtime to work. Which one you use depends on your Ru
24
21
  gem 'therubyracer' # If using Ruby
25
22
  gem 'therubyrhino' # If using JRuby
26
23
  gem 'jquery-rails' # If using Bootstrap's JS plugins.
27
- gem 'less-rails-bootstrap', '3.0.0.rc1', github: 'metaskills/less-rails-bootstrap', branch: '3.0.0-rc1'
24
+ gem 'less-rails-bootstrap'
28
25
  ```
29
26
 
30
27
  ## Basic CSS Use
@@ -72,16 +69,7 @@ We also have a test rails project setup using all the examples documented above.
72
69
  [https://github.com/metaskills/less-rails-bootstrap-test](https://github.com/metaskills/less-rails-bootstrap-test)
73
70
 
74
71
 
75
- ## Contributing
76
-
77
- Here are the steps to update the version of twitter bootstrap used.
78
-
79
- * Clone this repository.
80
- * Clone the [bootstrap repo](https://github.com/twitter/bootstrap) in a twitter/bootstrap directory next to the clone of less-rails-bootstrap done above.
81
- * Change directories into the twitter/bootstrap clone and do a git checkout on the version you are targeting. For example `git checkout 3.0.0-wip`. This will setup the proper version to copy over.
82
- * Back in the less-rails-bootstrap project. Run the `./scripts/update_bootstrap.sh` script.
83
- * RUN THE TESTS!
84
-
72
+ ## [Contributing](https://github.com/metaskills/less-rails-bootstrap/blob/master/CONTRIBUTING.md)
85
73
 
86
74
  ## License
87
75
 
data/lib/less/rails/bootstrap/engine.rb CHANGED
@@ -6,7 +6,7 @@ module Less
6
6
  class Engine < ::Rails::Engine
7
7
 
8
8
  initializer 'less-rails-bootstrap.setup', :after => 'less-rails.after.load_config_initializers', :group => :all do |app|
9
- app.config.less.paths << File.join(config.root, 'vendor', 'frameworks')
9
+ app.config.less.paths << File.join(config.root, 'app', 'frameworks')
10
10
  end
11
11
 
12
12
  end
data/lib/less/rails/bootstrap/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Less
2
2
  module Rails
3
3
  module Bootstrap
4
- VERSION = "3.0.0.rc1"
4
+ VERSION = "3.0.1"
5
5
  end
6
6
  end
7
7
  end
data/scripts/update_bootstrap.sh CHANGED
@@ -2,21 +2,31 @@
2
2
 
3
3
  bs_dir='./twitter/bootstrap'
4
4
  lrb_dir='.'
5
- lrb_font_dir="$lrb_dir/vendor/assets/fonts/twitter/bootstrap"
6
- lrb_js_dir="$lrb_dir/vendor/assets/javascripts/twitter/bootstrap"
7
- lrb_styles_dir="$lrb_dir/vendor/assets/stylesheets/twitter"
8
- lrb_fw_dir="$lrb_dir/vendor/frameworks/twitter/bootstrap"
5
+
6
+ lrb_assets_dir="$lrb_dir/app/assets"
7
+ lrb_font_dir="$lrb_assets_dir/fonts/twitter/bootstrap"
8
+ lrb_js_dir="$lrb_assets_dir/javascripts/twitter/bootstrap"
9
+ lrb_styles_dir="$lrb_assets_dir/stylesheets/twitter"
10
+
11
+ lrb_bootstrap_js="$lrb_assets_dir/javascripts/twitter/bootstrap.js"
12
+ lrb_bootstrap_less="$lrb_assets_dir/stylesheets/twitter/bootstrap.less"
13
+
14
+ lrb_frameworks_dir="$lrb_dir/app/frameworks"
15
+ lrb_fw_dir="$lrb_frameworks_dir/twitter/bootstrap"
9
16
 
10
17
  error() {
11
- echo -e "\e[1;31m"$1"\e[0m"
18
+ echo -e -n "\033[1;31m$1"
19
+ echo -e '\033[0m'
12
20
  }
13
21
 
14
22
  success() {
15
- echo -e "\e[1;32m"$1"\e[0m"
23
+ echo -e -n "\033[1;32m$1"
24
+ echo -e '\033[0m'
16
25
  }
17
26
 
18
27
  info() {
19
- echo -e "\e[1;34m"$1"\e[0m"
28
+ echo -e -n "\033[1;34m$1"
29
+ echo -e '\033[0m'
20
30
  }
21
31
 
22
32
  if [ $# -ne 1 ]
@@ -35,6 +45,12 @@ info "Using $1..."
35
45
  git checkout --quiet $1
36
46
  cd ../../
37
47
 
48
+ info "Remove $lrb_assets_dir directory..."
49
+ rm -rf $lrb_assets_dir
50
+
51
+ info "Remove $lrb_frameworks_dir directory..."
52
+ rm -rf $lrb_frameworks_dir
53
+
38
54
  info "Copying fonts..."
39
55
  # fonts
40
56
  mkdir -p $lrb_font_dir/
@@ -45,6 +61,7 @@ done
45
61
 
46
62
  info "Copying scripts..."
47
63
  # scripts
64
+ mkdir -p $lrb_js_dir/
48
65
  for f in $bs_dir/js/*.js; do
49
66
  bn=$(basename $f)
50
67
  cp $f $lrb_js_dir/${bn/bootstrap-/}
@@ -52,11 +69,24 @@ done
52
69
 
53
70
  info "Copying styles..."
54
71
  # styles
72
+ mkdir -p $lrb_fw_dir
55
73
  for f in $bs_dir/less/*.less; do
56
74
  bn=$(basename $f)
57
- sed -e "s/url('@{glyphicons-font-path}/asset-url('twitter\/bootstrap/g" \
58
- -e 's#background-image: url(#background-image: asset-url(#g' \
59
- $f > $lrb_fw_dir/$bn
75
+ cp $f $lrb_fw_dir/$bn
60
76
  done
61
77
 
78
+ info "Apply patches..."
79
+ sed -i '' 's#^\(@icon-font-path:[[:space:]]*\"\).*\(\";\)#\1twitter/bootstrap/\2#g' $lrb_fw_dir/variables.less
80
+ sed -i '' 's#url(#asset-url(#g' $lrb_fw_dir/*.less
81
+
82
+ info "Generate bootstrap.js..."
83
+ for f in $lrb_js_dir/*.js; do
84
+ bn=$(basename $f)
85
+ echo "//= require twitter/bootstrap/$bn" >> $lrb_bootstrap_js
86
+ done
87
+
88
+ info "Generate bootstrap.css.less..."
89
+ mkdir -p $lrb_styles_dir
90
+ echo "@import \"twitter/bootstrap/bootstrap\";" >> $lrb_bootstrap_less
91
+
62
92
  success "Done"
data/test/cases/engine_spec.rb CHANGED
@@ -8,7 +8,7 @@ class EngineSpec < Less::Rails::Bootstrap::Spec
8
8
 
9
9
  it 'must append engines assets stylesheets to less-rails load paths' do
10
10
  dummy_config.less.paths.must_be_instance_of Array
11
- dummy_config.less.paths.must_include project_vendor_twitter_bootstrap
11
+ dummy_config.less.paths.must_include project_app_twitter_bootstrap
12
12
  end
13
13
 
14
14
 
data/test/cases/usage_css_spec.rb CHANGED
@@ -21,7 +21,7 @@ class UsageCssSpec < Less::Rails::Bootstrap::Spec
21
21
  let(:app_css) { dummy_asset('fonts.css.less') }
22
22
 
23
23
  it 'uses less-rails asset-url helper for fonts' do
24
- app_css.must_include 'url(/assets/twitter/bootstrap/glyphiconshalflings-regular.eot)'
24
+ app_css.must_include "/assets/twitter/bootstrap/glyphicons-halflings-regular"
25
25
  end
26
26
 
27
27
  end
data/test/spec_helper.rb CHANGED
@@ -1,8 +1,9 @@
1
1
  require 'rubygems'
2
2
  require 'bundler'
3
3
  Bundler.require
4
- require 'minitest/autorun'
5
4
  require 'less-rails-bootstrap'
5
+ require 'minitest/autorun'
6
+ require 'minitest/spec'
6
7
  require 'dummy_app/init'
7
8
 
8
9
  module Less
@@ -42,8 +43,8 @@ module Less
42
43
  File.expand_path File.join(File.dirname(__FILE__), '..')
43
44
  end
44
45
 
45
- def project_vendor_twitter_bootstrap
46
- File.join project_root, 'vendor', 'frameworks'
46
+ def project_app_twitter_bootstrap
47
+ File.join project_root, 'app', 'frameworks'
47
48
  end
48
49
 
49
50
  end
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: less-rails-bootstrap
3
3
  version: !ruby/object:Gem::Version
4
- prerelease: 6
5
- version: 3.0.0.rc1
4
+ prerelease:
5
+ version: 3.0.1
6
6
  platform: ruby
7
7
  authors:
8
8
  - Ken Collins
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-08-03 00:00:00.000000000 Z
12
+ date: 2013-08-29 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: less-rails
@@ -85,10 +85,69 @@ files:
85
85
  - .gitignore
86
86
  - .travis.yml
87
87
  - CHANGELOG.md
88
+ - CONTRIBUTING.md
88
89
  - Gemfile
89
90
  - Guardfile
90
91
  - README.md
91
92
  - Rakefile
93
+ - app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.eot
94
+ - app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.svg
95
+ - app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.ttf
96
+ - app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.woff
97
+ - app/assets/javascripts/twitter/bootstrap.js
98
+ - app/assets/javascripts/twitter/bootstrap/affix.js
99
+ - app/assets/javascripts/twitter/bootstrap/alert.js
100
+ - app/assets/javascripts/twitter/bootstrap/button.js
101
+ - app/assets/javascripts/twitter/bootstrap/carousel.js
102
+ - app/assets/javascripts/twitter/bootstrap/collapse.js
103
+ - app/assets/javascripts/twitter/bootstrap/dropdown.js
104
+ - app/assets/javascripts/twitter/bootstrap/modal.js
105
+ - app/assets/javascripts/twitter/bootstrap/popover.js
106
+ - app/assets/javascripts/twitter/bootstrap/scrollspy.js
107
+ - app/assets/javascripts/twitter/bootstrap/tab.js
108
+ - app/assets/javascripts/twitter/bootstrap/tooltip.js
109
+ - app/assets/javascripts/twitter/bootstrap/transition.js
110
+ - app/assets/stylesheets/twitter/bootstrap.less
111
+ - app/frameworks/twitter/bootstrap/alerts.less
112
+ - app/frameworks/twitter/bootstrap/badges.less
113
+ - app/frameworks/twitter/bootstrap/bootstrap.less
114
+ - app/frameworks/twitter/bootstrap/breadcrumbs.less
115
+ - app/frameworks/twitter/bootstrap/button-groups.less
116
+ - app/frameworks/twitter/bootstrap/buttons.less
117
+ - app/frameworks/twitter/bootstrap/carousel.less
118
+ - app/frameworks/twitter/bootstrap/close.less
119
+ - app/frameworks/twitter/bootstrap/code.less
120
+ - app/frameworks/twitter/bootstrap/component-animations.less
121
+ - app/frameworks/twitter/bootstrap/dropdowns.less
122
+ - app/frameworks/twitter/bootstrap/forms.less
123
+ - app/frameworks/twitter/bootstrap/glyphicons.less
124
+ - app/frameworks/twitter/bootstrap/grid.less
125
+ - app/frameworks/twitter/bootstrap/input-groups.less
126
+ - app/frameworks/twitter/bootstrap/jumbotron.less
127
+ - app/frameworks/twitter/bootstrap/labels.less
128
+ - app/frameworks/twitter/bootstrap/list-group.less
129
+ - app/frameworks/twitter/bootstrap/media.less
130
+ - app/frameworks/twitter/bootstrap/mixins.less
131
+ - app/frameworks/twitter/bootstrap/modals.less
132
+ - app/frameworks/twitter/bootstrap/navbar.less
133
+ - app/frameworks/twitter/bootstrap/navs.less
134
+ - app/frameworks/twitter/bootstrap/normalize.less
135
+ - app/frameworks/twitter/bootstrap/pager.less
136
+ - app/frameworks/twitter/bootstrap/pagination.less
137
+ - app/frameworks/twitter/bootstrap/panels.less
138
+ - app/frameworks/twitter/bootstrap/popovers.less
139
+ - app/frameworks/twitter/bootstrap/print.less
140
+ - app/frameworks/twitter/bootstrap/progress-bars.less
141
+ - app/frameworks/twitter/bootstrap/responsive-utilities.less
142
+ - app/frameworks/twitter/bootstrap/scaffolding.less
143
+ - app/frameworks/twitter/bootstrap/tables.less
144
+ - app/frameworks/twitter/bootstrap/theme.less
145
+ - app/frameworks/twitter/bootstrap/thumbnails.less
146
+ - app/frameworks/twitter/bootstrap/tooltip.less
147
+ - app/frameworks/twitter/bootstrap/type.less
148
+ - app/frameworks/twitter/bootstrap/utilities.less
149
+ - app/frameworks/twitter/bootstrap/variables.less
150
+ - app/frameworks/twitter/bootstrap/wells.less
92
151
  - less-rails-bootstrap.gemspec
93
152
  - lib/less-rails-bootstrap.rb
94
153
  - lib/less/rails/bootstrap.rb
@@ -106,64 +165,6 @@ files:
106
165
  - test/dummy_app/app/assets/stylesheets/individual.css.less
107
166
  - test/dummy_app/init.rb
108
167
  - test/spec_helper.rb
109
- - vendor/assets/fonts/twitter/bootstrap/glyphiconshalflings-regular.eot
110
- - vendor/assets/fonts/twitter/bootstrap/glyphiconshalflings-regular.otf
111
- - vendor/assets/fonts/twitter/bootstrap/glyphiconshalflings-regular.svg
112
- - vendor/assets/fonts/twitter/bootstrap/glyphiconshalflings-regular.ttf
113
- - vendor/assets/fonts/twitter/bootstrap/glyphiconshalflings-regular.woff
114
- - vendor/assets/javascripts/twitter/bootstrap.js
115
- - vendor/assets/javascripts/twitter/bootstrap/affix.js
116
- - vendor/assets/javascripts/twitter/bootstrap/alert.js
117
- - vendor/assets/javascripts/twitter/bootstrap/button.js
118
- - vendor/assets/javascripts/twitter/bootstrap/carousel.js
119
- - vendor/assets/javascripts/twitter/bootstrap/collapse.js
120
- - vendor/assets/javascripts/twitter/bootstrap/dropdown.js
121
- - vendor/assets/javascripts/twitter/bootstrap/modal.js
122
- - vendor/assets/javascripts/twitter/bootstrap/popover.js
123
- - vendor/assets/javascripts/twitter/bootstrap/scrollspy.js
124
- - vendor/assets/javascripts/twitter/bootstrap/tab.js
125
- - vendor/assets/javascripts/twitter/bootstrap/tooltip.js
126
- - vendor/assets/javascripts/twitter/bootstrap/transition.js
127
- - vendor/assets/stylesheets/twitter/bootstrap.less
128
- - vendor/frameworks/twitter/bootstrap/accordion.less
129
- - vendor/frameworks/twitter/bootstrap/alerts.less
130
- - vendor/frameworks/twitter/bootstrap/badges.less
131
- - vendor/frameworks/twitter/bootstrap/bootstrap.less
132
- - vendor/frameworks/twitter/bootstrap/breadcrumbs.less
133
- - vendor/frameworks/twitter/bootstrap/button-groups.less
134
- - vendor/frameworks/twitter/bootstrap/buttons.less
135
- - vendor/frameworks/twitter/bootstrap/carousel.less
136
- - vendor/frameworks/twitter/bootstrap/close.less
137
- - vendor/frameworks/twitter/bootstrap/code.less
138
- - vendor/frameworks/twitter/bootstrap/component-animations.less
139
- - vendor/frameworks/twitter/bootstrap/dropdowns.less
140
- - vendor/frameworks/twitter/bootstrap/forms.less
141
- - vendor/frameworks/twitter/bootstrap/glyphicons.less
142
- - vendor/frameworks/twitter/bootstrap/grid.less
143
- - vendor/frameworks/twitter/bootstrap/jumbotron.less
144
- - vendor/frameworks/twitter/bootstrap/labels.less
145
- - vendor/frameworks/twitter/bootstrap/list-group.less
146
- - vendor/frameworks/twitter/bootstrap/media.less
147
- - vendor/frameworks/twitter/bootstrap/mixins.less
148
- - vendor/frameworks/twitter/bootstrap/modals.less
149
- - vendor/frameworks/twitter/bootstrap/navbar.less
150
- - vendor/frameworks/twitter/bootstrap/navs.less
151
- - vendor/frameworks/twitter/bootstrap/normalize.less
152
- - vendor/frameworks/twitter/bootstrap/pager.less
153
- - vendor/frameworks/twitter/bootstrap/pagination.less
154
- - vendor/frameworks/twitter/bootstrap/panels.less
155
- - vendor/frameworks/twitter/bootstrap/popovers.less
156
- - vendor/frameworks/twitter/bootstrap/print.less
157
- - vendor/frameworks/twitter/bootstrap/progress-bars.less
158
- - vendor/frameworks/twitter/bootstrap/responsive-utilities.less
159
- - vendor/frameworks/twitter/bootstrap/scaffolding.less
160
- - vendor/frameworks/twitter/bootstrap/tables.less
161
- - vendor/frameworks/twitter/bootstrap/thumbnails.less
162
- - vendor/frameworks/twitter/bootstrap/tooltip.less
163
- - vendor/frameworks/twitter/bootstrap/type.less
164
- - vendor/frameworks/twitter/bootstrap/utilities.less
165
- - vendor/frameworks/twitter/bootstrap/variables.less
166
- - vendor/frameworks/twitter/bootstrap/wells.less
167
168
  homepage: http://github.com/metaskills/less-rails-bootstrap
168
169
  licenses: []
169
170
  post_install_message:
@@ -176,14 +177,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
176
177
  - !ruby/object:Gem::Version
177
178
  segments:
178
179
  - 0
179
- hash: 2182416616650389701
180
+ hash: -2979729463445026121
180
181
  version: '0'
181
182
  none: false
182
183
  required_rubygems_version: !ruby/object:Gem::Requirement
183
184
  requirements:
184
- - - ! '>'
185
+ - - ! '>='
185
186
  - !ruby/object:Gem::Version
186
- version: 1.3.1
187
+ segments:
188
+ - 0
189
+ hash: -2979729463445026121
190
+ version: '0'
187
191
  none: false
188
192
  requirements: []
189
193
  rubyforge_project: